diff options
author | Chris Zankel <chris@zankel.net> | 2014-10-20 21:26:01 -0700 |
---|---|---|
committer | Chris Zankel <chris@zankel.net> | 2014-10-20 21:26:01 -0700 |
commit | a13926db3e5ea5bbac297f59e9f35061f52892d3 (patch) | |
tree | b794f25550b7dbbe9cc8eda81633df9023b4821c /net/sched/sch_pie.c | |
parent | f2589bff1ce8b94cebc044e5dfeac4d4e8701cbc (diff) | |
parent | f114040e3ea6e07372334ade75d1ee0775c355e1 (diff) |
Merge tag 'v3.18-rc1' into for_next
Linux 3.18-rc1
Diffstat (limited to 'net/sched/sch_pie.c')
-rw-r--r-- | net/sched/sch_pie.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/sch_pie.c b/net/sched/sch_pie.c index fefeeb73f15f..33d7a98a7a97 100644 --- a/net/sched/sch_pie.c +++ b/net/sched/sch_pie.c @@ -232,7 +232,7 @@ static int pie_change(struct Qdisc *sch, struct nlattr *opt) while (sch->q.qlen > sch->limit) { struct sk_buff *skb = __skb_dequeue(&sch->q); - sch->qstats.backlog -= qdisc_pkt_len(skb); + qdisc_qstats_backlog_dec(sch, skb); qdisc_drop(skb, sch); } qdisc_tree_decrease_qlen(sch, qlen - sch->q.qlen); |