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

Commit b396cca6 authored May 11, 2015 by Eric Dumazet Committed by David S. Miller May 11, 2015

net: sched: deprecate enqueue_root()



Only left enqueue_root() user is netem, and it looks not necessary :

qdisc_skb_cb(skb)->pkt_len is preserved after one skb_clone()

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 3824246d

include/net/sch_generic.h

+0 −6

Original line number	Diff line number	Diff line
		@@ -501,12 +501,6 @@ static inline int qdisc_enqueue(struct sk_buff skb, struct Qdisc sch)
		return sch->enqueue(skb, sch);
		}

		static inline int qdisc_enqueue_root(struct sk_buff skb, struct Qdisc sch)
		{
		qdisc_skb_cb(skb)->pkt_len = skb->len;
		return qdisc_enqueue(skb, sch) & NET_XMIT_MASK;
		}

		static inline bool qdisc_is_percpu_stats(const struct Qdisc *q)
		{
		return q->flags & TCQ_F_CPUSTATS;

net/sched/sch_netem.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -440,9 +440,9 @@ static int netem_enqueue(struct sk_buff skb, struct Qdisc sch)
		if (count > 1 && (skb2 = skb_clone(skb, GFP_ATOMIC)) != NULL) {
		struct Qdisc *rootq = qdisc_root(sch);
		u32 dupsave = q->duplicate; /* prevent duplicating a dup... */
		q->duplicate = 0;

		qdisc_enqueue_root(skb2, rootq);
		q->duplicate = 0;
		rootq->enqueue(skb2, rootq);
		q->duplicate = dupsave;
		}