diff options
| author | David S. Miller <davem@davemloft.net> | 2011-01-20 03:06:15 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-20 03:06:15 -0500 |
| commit | a07aa004c8d814a975b1a68afdb7baaa8f1b91d5 (patch) | |
| tree | 652edc2dce9732a64780b9e332034b6567631a8b /net/sched/Kconfig | |
| 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/Kconfig')
| -rw-r--r-- | net/sched/Kconfig | 5 |
1 files changed, 1 insertions, 4 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 |