diff options
| author | David S. Miller <davem@davemloft.net> | 2018-06-26 08:07:17 +0900 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-06-26 08:07:17 +0900 |
| commit | 9ff3b40e411c00870d1c29cd6b843fca7c4160ae (patch) | |
| tree | 4d58943bf8907f5704ba004fd5383c0d7683c61f /net/sched | |
| parent | 823819507095135b475a99048f0b0b6e75580fbc (diff) | |
| parent | 6f0d349d922ba44e4348a17a78ea51b7135965b1 (diff) | |
| download | linux-9ff3b40e411c00870d1c29cd6b843fca7c4160ae.tar.bz2 | |
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/sched')
| -rw-r--r-- | net/sched/sch_hfsc.c | 4 |
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 |