diff options
| author |   WANG Cong <xiyou.wangcong@gmail.com> | 2016-02-25 14:55:01 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-02-29 17:02:33 -0500 |
| commit | 2ccccf5fb43ff62b2b96cc58d95fc0b3596516e4 (patch) | |
| tree | d73ec90b0c0cfd1191ef35a4aa0eaea78af1f100 /include/net/sch_generic.h | |
| parent | net_sched: introduce qdisc_replace() helper (diff) | |
| download | linux-dev-2ccccf5fb43ff62b2b96cc58d95fc0b3596516e4.tar.xz linux-dev-2ccccf5fb43ff62b2b96cc58d95fc0b3596516e4.zip | |
net_sched: update hierarchical backlog too
When the bottom qdisc decides to, for example, drop some packet,
it calls qdisc_tree_decrease_qlen() to update the queue length
for all its ancestors, we need to update the backlog too to
keep the stats on root qdisc accurate.
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/sch_generic.h')
| -rw-r--r-- | include/net/sch_generic.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index 8fdad9f7a2fb..e5bba897d206 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h @@ -396,7 +396,8 @@ struct Qdisc *dev_graft_qdisc(struct netdev_queue *dev_queue, struct Qdisc *qdisc); void qdisc_reset(struct Qdisc *qdisc); void qdisc_destroy(struct Qdisc *qdisc); -void qdisc_tree_decrease_qlen(struct Qdisc *qdisc, unsigned int n); +void qdisc_tree_reduce_backlog(struct Qdisc *qdisc, unsigned int n, + unsigned int len); struct Qdisc *qdisc_alloc(struct netdev_queue *dev_queue, const struct Qdisc_ops *ops); struct Qdisc *qdisc_create_dflt(struct netdev_queue *dev_queue, @@ -716,7 +717,7 @@ static inline struct Qdisc *qdisc_replace(struct Qdisc *sch, struct Qdisc *new, old = *pold; *pold = new; if (old != NULL) { - qdisc_tree_decrease_qlen(old, old->q.qlen); + qdisc_tree_reduce_backlog(old, old->q.qlen, old->qstats.backlog); qdisc_reset(old); } sch_tree_unlock(sch); |