git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-4.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
[sfrench/cifs-2.6.git]
/
net
/
sched
/
sch_qfq.c
diff --git
a/net/sched/sch_qfq.c
b/net/sched/sch_qfq.c
index cd661a7f81e6db4252f1b3a9b4da4adae2728248..6ddfd4991108ad9de057a22175d87f667c24f370 100644
(file)
--- 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);