aboutsummaryrefslogtreecommitdiffstats
path: root/net/sched/sch_hfsc.c
diff options
context:
space:
mode:
authorCong Wang <xiyou.wangcong@gmail.com>2018-06-22 14:33:16 -0700
committerDavid S. Miller <davem@davemloft.net>2018-06-23 10:58:46 +0900
commit35b42da69e35536da603a50e40aa6c41b2f7b0f8 (patch)
tree45c3abeae1f65f4552c3ce5fdd2c01a032e15670 /net/sched/sch_hfsc.c
parentMerge branch 'dccp-fixes-around-rx_tstamp_last_feedback' (diff)
downloadlinux-dev-35b42da69e35536da603a50e40aa6c41b2f7b0f8.tar.xz
linux-dev-35b42da69e35536da603a50e40aa6c41b2f7b0f8.zip
net_sched: remove a bogus warning in hfsc
In update_vf(): cftree_remove(cl); update_cfmin(cl->cl_parent); the cl_cfmin of cl->cl_parent is intentionally updated to 0 when that parent only has one child. And if this parent is root qdisc, we could end up, in hfsc_schedule_watchdog(), that we can't decide the next schedule time for qdisc watchdog. But it seems safe that we can just skip it, as this watchdog is not always scheduled anyway. Thanks to Marco for testing all the cases, nothing is broken. Reported-by: Marco Berizzi <pupilla@libero.it> Tested-by: Marco Berizzi <pupilla@libero.it> Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_hfsc.c')
-rw-r--r--net/sched/sch_hfsc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/sch_hfsc.c b/net/sched/sch_hfsc.c
index 3ae9877ea205..3278a76f6861 100644
--- a/net/sched/sch_hfsc.c
+++ b/net/sched/sch_hfsc.c
@@ -1385,8 +1385,8 @@ hfsc_schedule_watchdog(struct Qdisc *sch)
if (next_time == 0 || next_time > q->root.cl_cfmin)
next_time = q->root.cl_cfmin;
}
- WARN_ON(next_time == 0);
- qdisc_watchdog_schedule(&q->watchdog, next_time);
+ if (next_time)
+ qdisc_watchdog_schedule(&q->watchdog, next_time);
}
static int