diff options
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 73431d4aa6ef..e318f458713e 100644 --- a/net/sched/Kconfig +++ b/net/sched/Kconfig | |||
@@ -255,7 +255,7 @@ config NET_CLS_TCINDEX | |||
255 | 255 | ||
256 | config NET_CLS_ROUTE4 | 256 | config NET_CLS_ROUTE4 |
257 | tristate "Routing decision (ROUTE)" | 257 | tristate "Routing decision (ROUTE)" |
258 | select NET_CLS_ROUTE | 258 | select IP_ROUTE_CLASSID |
259 | select NET_CLS | 259 | select NET_CLS |
260 | ---help--- | 260 | ---help--- |
261 | If you say Y here, you will be able to classify packets | 261 | If you say Y here, you will be able to classify packets |
@@ -264,9 +264,6 @@ config NET_CLS_ROUTE4 | |||
264 | To compile this code as a module, choose M here: the | 264 | To compile this code as a module, choose M here: the |
265 | module will be called cls_route. | 265 | module will be called cls_route. |
266 | 266 | ||
267 | config NET_CLS_ROUTE | ||
268 | bool | ||
269 | |||
270 | config NET_CLS_FW | 267 | config NET_CLS_FW |
271 | tristate "Netfilter mark (FW)" | 268 | tristate "Netfilter mark (FW)" |
272 | select NET_CLS | 269 | select NET_CLS |
diff --git a/net/sched/cls_flow.c b/net/sched/cls_flow.c index 5eec16e516b9..8ec01391d988 100644 --- a/net/sched/cls_flow.c +++ b/net/sched/cls_flow.c | |||
@@ -276,7 +276,7 @@ fallback: | |||
276 | 276 | ||
277 | static u32 flow_get_rtclassid(const struct sk_buff *skb) | 277 | static u32 flow_get_rtclassid(const struct sk_buff *skb) |
278 | { | 278 | { |
279 | #ifdef CONFIG_NET_CLS_ROUTE | 279 | #ifdef CONFIG_IP_ROUTE_CLASSID |
280 | if (skb_dst(skb)) | 280 | if (skb_dst(skb)) |
281 | return skb_dst(skb)->tclassid; | 281 | return skb_dst(skb)->tclassid; |
282 | #endif | 282 | #endif |
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) | |||
252 | if (unlikely(skb_dst(skb) == NULL)) | 252 | if (unlikely(skb_dst(skb) == NULL)) |
253 | *err = -1; | 253 | *err = -1; |
254 | else | 254 | else |
255 | #ifdef CONFIG_NET_CLS_ROUTE | 255 | #ifdef CONFIG_IP_ROUTE_CLASSID |
256 | dst->value = skb_dst(skb)->tclassid; | 256 | dst->value = skb_dst(skb)->tclassid; |
257 | #else | 257 | #else |
258 | dst->value = 0; | 258 | dst->value = 0; |