summaryrefslogtreecommitdiffstats
path: root/net/sched/sch_codel.c
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2016-09-18 00:57:33 +0200
committerDavid S. Miller <davem@davemloft.net>2016-09-19 01:47:18 -0400
commited760cb8aae7c2b84c193d4a7637b0c9e752f07e (patch)
treecbff0f30ea3b3cb037384708e172893ae1efcf17 /net/sched/sch_codel.c
parentec323368793b8570c02e723127611a8d906a9b3f (diff)
downloadlinux-stable-ed760cb8aae7c2b84c193d4a7637b0c9e752f07e.tar.gz
linux-stable-ed760cb8aae7c2b84c193d4a7637b0c9e752f07e.tar.bz2
linux-stable-ed760cb8aae7c2b84c193d4a7637b0c9e752f07e.zip
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>
Diffstat (limited to 'net/sched/sch_codel.c')
-rw-r--r--net/sched/sch_codel.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/sch_codel.c b/net/sched/sch_codel.c
index 4002df3c7d9f..5bfa79ee657c 100644
--- 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);