diff options
| author | Konstantin Khlebnikov <khlebnikov@yandex-team.ru> | 2017-09-20 15:45:36 +0300 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2018-01-01 20:51:36 +0000 |
| commit | b792e84aa3736b71c60bf3dd6b4f4f639fcbac79 (patch) | |
| tree | 99fd627577fcb1005ac2cfc4e039395e322e86da | |
| parent | 0053fe7e715ccda439418c9c568f99799bed30ad (diff) | |
net_sched: always reset qdisc backlog in qdisc_reset()
commit c8e1812960eeae42e2183154927028511c4bc566 upstream.
SKB stored in qdisc->gso_skb also counted into backlog.
Some qdiscs don't reset backlog to zero in ->reset(),
for example sfq just dequeue and free all queued skb.
Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Fixes: 2ccccf5fb43f ("net_sched: update hierarchical backlog too")
Signed-off-by: David S. Miller <davem@davemloft.net>
[bwh: Backported to 3.16: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | net/sched/sch_generic.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c index c0bdd3bce189..c15c37370f5a 100644 --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c @@ -621,6 +621,7 @@ void qdisc_reset(struct Qdisc *qdisc) qdisc->gso_skb = NULL; qdisc->q.qlen = 0; } + qdisc->qstats.backlog = 0; } EXPORT_SYMBOL(qdisc_reset); |