summaryrefslogtreecommitdiffstats
path: root/net/sched/em_meta.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-01-20 00:06:15 -0800
committerDavid S. Miller <davem@davemloft.net>2011-01-20 00:06:15 -0800
commita07aa004c8d814a975b1a68afdb7baaa8f1b91d5 (patch)
tree652edc2dce9732a64780b9e332034b6567631a8b /net/sched/em_meta.c
parentcc7ec456f82da7f89a5b376e613b3ac4311b3e9a (diff)
parent5d8449286456659cdd0998e62d80df2d9e77e9e3 (diff)
downloadlinux-a07aa004c8d814a975b1a68afdb7baaa8f1b91d5.tar.bz2
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
Diffstat (limited to 'net/sched/em_meta.c')
-rw-r--r--net/sched/em_meta.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/em_meta.c b/net/sched/em_meta.c
index 7af1f65fe678..a889d099320f 100644
--- 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;