sched: remove qdisc arg from __qdisc_dequeue_head

Moves qdisc stat accouting to qdisc_dequeue_head.

The only direct caller of the __qdisc_dequeue_head version open-codes
this now.

This allows us to later use __qdisc_dequeue_head as a replacement
of __skb_dequeue() (which operates on sk_buff_head list).

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 6 insertions, 1 deletions

diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index 5e63bf638350..73877d9c2bcb 100644
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -506,7 +506,12 @@ static struct sk_buff *pfifo_fast_dequeue(struct Qdisc *qdisc)
 
         if (likely(band >= 0)) {
                 struct sk_buff_head *list = band2list(priv, band);
-                struct sk_buff *skb = __qdisc_dequeue_head(qdisc, list);
+                struct sk_buff *skb = __qdisc_dequeue_head(list);
+
+                if (likely(skb != NULL)) {
+                        qdisc_qstats_backlog_dec(qdisc, skb);
+                        qdisc_bstats_update(qdisc, skb);
+                }
 
                 qdisc->q.qlen--;
                 if (skb_queue_empty(list))