git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
[pandora-kernel.git]
/
net
/
sched
/
em_meta.c
diff --git
a/net/sched/em_meta.c
b/net/sched/em_meta.c
index
7af1f65
..
a889d09
100644
(file)
--- a/
net/sched/em_meta.c
+++ b/
net/sched/em_meta.c
@@
-252,7
+252,7
@@
META_COLLECTOR(int_rtclassid)
if (unlikely(skb_dst(skb) == NULL))
*err = -1;
else
-#ifdef CONFIG_
NET_CLS_ROUTE
+#ifdef CONFIG_
IP_ROUTE_CLASSID
dst->value = skb_dst(skb)->tclassid;
#else
dst->value = 0;