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

Commit 97d0678f authored Sep 18, 2016 by Florian Westphal Committed by David S. Miller Sep 19, 2016

sched: don't use skb queue helpers



A followup change will replace the sk_buff_head in the qdisc
struct with a slightly different list.

Use of the sk_buff_head helpers will thus cause compiler
warnings.

Open-code these accesses in an extra change to ease review.

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

parent 1486587b

net/sched/sch_fifo.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@ static int bfifo_enqueue(struct sk_buff skb, struct Qdisc sch,
		static int pfifo_enqueue(struct sk_buff skb, struct Qdisc sch,
		struct sk_buff **to_free)
		{
		if (likely(skb_queue_len(&sch->q) < sch->limit))
		if (likely(sch->q.qlen < sch->limit))
		return qdisc_enqueue_tail(skb, sch);

		return qdisc_drop(skb, sch, to_free);
		@@ -42,7 +42,7 @@ static int pfifo_tail_enqueue(struct sk_buff skb, struct Qdisc sch,
		{
		unsigned int prev_backlog;

		if (likely(skb_queue_len(&sch->q) < sch->limit))
		if (likely(sch->q.qlen < sch->limit))
		return qdisc_enqueue_tail(skb, sch);

		prev_backlog = sch->qstats.backlog;

net/sched/sch_generic.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -486,7 +486,7 @@ static inline struct sk_buff_head band2list(struct pfifo_fast_priv priv,
		static int pfifo_fast_enqueue(struct sk_buff skb, struct Qdisc qdisc,
		struct sk_buff **to_free)
		{
		if (skb_queue_len(&qdisc->q) < qdisc_dev(qdisc)->tx_queue_len) {
		if (qdisc->q.qlen < qdisc_dev(qdisc)->tx_queue_len) {
		int band = prio2band[skb->priority & TC_PRIO_MAX];
		struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
		struct sk_buff_head *list = band2list(priv, band);

net/sched/sch_netem.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -502,7 +502,7 @@ static int netem_enqueue(struct sk_buff skb, struct Qdisc sch,
		1<<(prandom_u32() % 8);
		}

		if (unlikely(skb_queue_len(&sch->q) >= sch->limit))
		if (unlikely(sch->q.qlen >= sch->limit))
		return qdisc_drop(skb, sch, to_free);

		qdisc_qstats_backlog_inc(sch, skb);
		@@ -522,7 +522,7 @@ static int netem_enqueue(struct sk_buff skb, struct Qdisc sch,
		if (q->rate) {
		struct sk_buff *last;

		if (!skb_queue_empty(&sch->q))
		if (sch->q.qlen)
		last = skb_peek_tail(&sch->q);
		else
		last = netem_rb_to_skb(rb_last(&q->t_root));