diff options
| author | Gao Feng <gfree.wind@vip.163.com> | 2017-09-04 08:21:12 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-09-07 06:20:07 +0200 |
| commit | 39ad1297a2084e0724da73d9eda2ceb9573a5d6c (patch) | |
| tree | 656f10ecd9c62b74561083fb8a2ef1f0a68fec9d | |
| parent | dt-binding: phy: don't confuse with Ethernet phy properties (diff) | |
| download | linux-39ad1297a2084e0724da73d9eda2ceb9573a5d6c.tar.xz linux-39ad1297a2084e0724da73d9eda2ceb9573a5d6c.zip | |
sched: Use __qdisc_drop instead of kfree_skb in sch_prio and sch_qfq
The commit 520ac30f4551 ("net_sched: drop packets after root qdisc lock
is released) made a big change of tc for performance. There are two points
left in sch_prio and sch_qfq which are not changed with that commit. Now
enhance them now with __qdisc_drop.
Signed-off-by: Gao Feng <gfree.wind@vip.163.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/sched/sch_prio.c | 2 | ||||
| -rw-r--r-- | net/sched/sch_qfq.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/sch_prio.c b/net/sched/sch_prio.c index f31b28f788c0..2dd6c68ae91e 100644 --- a/net/sched/sch_prio.c +++ b/net/sched/sch_prio.c @@ -80,7 +80,7 @@ prio_enqueue(struct sk_buff *skb, struct Qdisc *sch, struct sk_buff **to_free) if (ret & __NET_XMIT_BYPASS) qdisc_qstats_drop(sch); - kfree_skb(skb); + __qdisc_drop(skb, to_free); return ret; } #endif diff --git a/net/sched/sch_qfq.c b/net/sched/sch_qfq.c index cd661a7f81e6..6ddfd4991108 100644 --- a/net/sched/sch_qfq.c +++ b/net/sched/sch_qfq.c @@ -1215,7 +1215,7 @@ static int qfq_enqueue(struct sk_buff *skb, struct Qdisc *sch, if (cl == NULL) { if (err & __NET_XMIT_BYPASS) qdisc_qstats_drop(sch); - kfree_skb(skb); + __qdisc_drop(skb, to_free); return err; } pr_debug("qfq_enqueue: cl = %x\n", cl->common.classid); |