diff options
| author | David S. Miller <davem@davemloft.net> | 2011-01-20 00:06:15 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-20 00:06:15 -0800 |
| commit | a07aa004c8d814a975b1a68afdb7baaa8f1b91d5 (patch) | |
| tree | 652edc2dce9732a64780b9e332034b6567631a8b /net/sched | |
| parent | cc7ec456f82da7f89a5b376e613b3ac4311b3e9a (diff) | |
| parent | 5d8449286456659cdd0998e62d80df2d9e77e9e3 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
Diffstat (limited to 'net/sched')
| -rw-r--r-- | net/sched/Kconfig | 5 | ||||
| -rw-r--r-- | net/sched/cls_flow.c | 2 | ||||
| -rw-r--r-- | net/sched/em_meta.c | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/net/sched/Kconfig b/net/sched/Kconfig index 73431d4aa6e..e318f458713 100644 --- a/net/sched/Kconfig +++ b/net/sched/Kconfig @@ -255,7 +255,7 @@ config NET_CLS_TCINDEX config NET_CLS_ROUTE4 tristate "Routing decision (ROUTE)" - select NET_CLS_ROUTE + select IP_ROUTE_CLASSID select NET_CLS ---help--- If you say Y here, you will be able to classify packets @@ -264,9 +264,6 @@ config NET_CLS_ROUTE4 To compile this code as a module, choose M here: the module will be called cls_route. -config NET_CLS_ROUTE - bool - config NET_CLS_FW tristate "Netfilter mark (FW)" select NET_CLS diff --git a/net/sched/cls_flow.c b/net/sched/cls_flow.c index 5eec16e516b..8ec01391d98 100644 --- a/net/sched/cls_flow.c +++ b/net/sched/cls_flow.c @@ -276,7 +276,7 @@ fallback: static u32 flow_get_rtclassid(const struct sk_buff *skb) { -#ifdef CONFIG_NET_CLS_ROUTE +#ifdef CONFIG_IP_ROUTE_CLASSID if (skb_dst(skb)) return skb_dst(skb)->tclassid; #endif diff --git a/net/sched/em_meta.c b/net/sched/em_meta.c index 7af1f65fe67..a889d099320 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; |