diff options
| author | Eric Dumazet | 2015-05-11 18:06:56 +0200 |
|---|---|---|
| committer | David S. Miller | 2015-05-11 20:17:32 +0200 |
| commit | b396cca6fafccf16206a5d041d59c9e6b65b6f5a (patch) | |
| tree | fe3b01a37526d5398cae514cac51c88fc8997879 | |
| parent | net: ll_temac: Use one return statement instead of two (diff) | |
| download | kernel-qcow2-linux-b396cca6fafccf16206a5d041d59c9e6b65b6f5a.tar.gz kernel-qcow2-linux-b396cca6fafccf16206a5d041d59c9e6b65b6f5a.tar.xz kernel-qcow2-linux-b396cca6fafccf16206a5d041d59c9e6b65b6f5a.zip | |
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>
| -rw-r--r-- | include/net/sch_generic.h | 6 | ||||
| -rw-r--r-- | net/sched/sch_netem.c | 4 |
2 files changed, 2 insertions, 8 deletions
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index 994b5a092f33..1b0a2e88ed2b 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h @@ -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; diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c index 956ead2cab9a..5abd1d9de989 100644 --- a/net/sched/sch_netem.c +++ b/net/sched/sch_netem.c @@ -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; } |