Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed760cb8 authored by Florian Westphal's avatar Florian Westphal Committed by David S. Miller
Browse files

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: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ec323368

net/sched/sch_codel.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

net/sched/sch_netem.c

+1 −1
Original line number Diff line number Diff line
@@ -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:

net/sched/sch_pie.c

+1 −1
Original line number Diff line number Diff line
@@ -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);