diff options
| author | Konstantin Khlebnikov <khlebnikov@yandex-team.ru> | 2017-08-15 16:39:59 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-08-16 20:55:34 +0300 |
| commit | 959466588aa7f84ccf79ae36a1d89542eaf9aaec (patch) | |
| tree | 92eb64dfd551fdcf0b9e09b113fe59bc3f178557 /net/sched/sch_qfq.c | |
| parent | 869cec99b4f7c4b97e3e912529cf8505ed1e6c25 (diff) | |
| download | linux-959466588aa7f84ccf79ae36a1d89542eaf9aaec.tar.xz | |
net_sched: call qlen_notify only if child qdisc is empty
This callback is used for deactivating class in parent qdisc.
This is cheaper to test queue length right here.
Also this allows to catch draining screwed backlog and prevent
second deactivation of already inactive parent class which will
crash kernel for sure. Kernel with print warning at destruction
of child qdisc where no packets but backlog is not zero.
Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_qfq.c')
| -rw-r--r-- | net/sched/sch_qfq.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/sched/sch_qfq.c b/net/sched/sch_qfq.c index 0e16dfda0bd7..9caa959f91e1 100644 --- a/net/sched/sch_qfq.c +++ b/net/sched/sch_qfq.c @@ -1428,8 +1428,7 @@ static void qfq_qlen_notify(struct Qdisc *sch, unsigned long arg) struct qfq_sched *q = qdisc_priv(sch); struct qfq_class *cl = (struct qfq_class *)arg; - if (cl->qdisc->q.qlen == 0) - qfq_deactivate_class(q, cl); + qfq_deactivate_class(q, cl); } static int qfq_init_qdisc(struct Qdisc *sch, struct nlattr *opt) |