sched: replace __skb_dequeue with __qdisc_dequeue_head

After previous patch these functions are identical.
Replace __skb_dequeue in qdiscs with __qdisc_dequeue_head.

Next patch will then make __qdisc_dequeue_head handle
single-linked list instead of strcut sk_buff_head argument.

Doesn't change generated code.

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

diff --git a/net/sched/sch_codel.c b/net/sched/sch_codel.c
index 4002df3c7d9f1cdec8965dc9930d399922349da7..5bfa79ee657cf3674d2b6204aee80f63207b84f9 100644 (file)
--- a/net/sched/sch_codel.c
+++ b/net/sched/sch_codel.c
@@ -69,7 +69,7 @@ struct codel_sched_data {
 static struct sk_buff *dequeue_func(struct codel_vars *vars, void *ctx)
 {
        struct Qdisc *sch = ctx;
-       struct sk_buff *skb = __skb_dequeue(&sch->q);
+       struct sk_buff *skb = __qdisc_dequeue_head(&sch->q);
 
        if (skb)
                sch->qstats.backlog -= qdisc_pkt_len(skb);
@@ -172,7 +172,7 @@ static int codel_change(struct Qdisc *sch, struct nlattr *opt)
 
        qlen = sch->q.qlen;
        while (sch->q.qlen > sch->limit) {
-               struct sk_buff *skb = __skb_dequeue(&sch->q);
+               struct sk_buff *skb = __qdisc_dequeue_head(&sch->q);
 
                dropped += qdisc_pkt_len(skb);
                qdisc_qstats_backlog_dec(sch, skb);

diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c
index 1832d7732dbc29b5ed4cb3db4f547880075ca0e6..0a964b35f8c7628b3593e517937b85615a23a144 100644 (file)
--- a/net/sched/sch_netem.c
+++ b/net/sched/sch_netem.c
@@ -587,7 +587,7 @@ static struct sk_buff *netem_dequeue(struct Qdisc *sch)
        struct rb_node *p;
 
 tfifo_dequeue:
-       skb = __skb_dequeue(&sch->q);
+       skb = __qdisc_dequeue_head(&sch->q);
        if (skb) {
                qdisc_qstats_backlog_dec(sch, skb);
 deliver:

diff --git a/net/sched/sch_pie.c b/net/sched/sch_pie.c
index d976d74b22d7d8f089d8190dd2f65f02ff20f196..5c3a99d6aa82ae0dcfd71ebceaae8de5d943e352 100644 (file)
--- a/net/sched/sch_pie.c
+++ b/net/sched/sch_pie.c
@@ -231,7 +231,7 @@ static int pie_change(struct Qdisc *sch, struct nlattr *opt)
        /* Drop excess packets if new limit is lower */
        qlen = sch->q.qlen;
        while (sch->q.qlen > sch->limit) {
-               struct sk_buff *skb = __skb_dequeue(&sch->q);
+               struct sk_buff *skb = __qdisc_dequeue_head(&sch->q);
 
                dropped += qdisc_pkt_len(skb);
                qdisc_qstats_backlog_dec(sch, skb);