projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
[linux-2.6-microblaze.git]
/
net
/
sched
/
sch_cake.c
diff --git
a/net/sched/sch_cake.c
b/net/sched/sch_cake.c
index
28af8b1
..
3c2300d
100644
(file)
--- a/
net/sched/sch_cake.c
+++ b/
net/sched/sch_cake.c
@@
-1665,7
+1665,7
@@
static u32 cake_classify(struct Qdisc *sch, struct cake_tin_data **t,
goto hash;
*qerr = NET_XMIT_SUCCESS | __NET_XMIT_BYPASS;
- result = tcf_classify(skb, filter, &res, false);
+ result = tcf_classify(skb,
NULL,
filter, &res, false);
if (result >= 0) {
#ifdef CONFIG_NET_CLS_ACT