diff options
author | Patrick McHardy <kaber@trash.net> | 2011-01-14 13:36:42 +0100 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2011-01-14 13:36:42 +0100 |
commit | c7066f70d9610df0b9406cc635fc09e86136e714 (patch) | |
tree | ce98855b2c1ba2da15b7b47fc7a447d1903c4d89 /net/sched/Kconfig | |
parent | ae90bdeaeac6b964b7a1e853a90a19f358a9ac20 (diff) | |
download | kernel_samsung_crespo-c7066f70d9610df0b9406cc635fc09e86136e714.zip kernel_samsung_crespo-c7066f70d9610df0b9406cc635fc09e86136e714.tar.gz kernel_samsung_crespo-c7066f70d9610df0b9406cc635fc09e86136e714.tar.bz2 |
netfilter: fix Kconfig dependencies
Fix dependencies of netfilter realm match: it depends on NET_CLS_ROUTE,
which itself depends on NET_SCHED; this dependency is missing from netfilter.
Since matching on realms is also useful without having NET_SCHED enabled and
the option really only controls whether the tclassid member is included in
route and dst entries, rename the config option to IP_ROUTE_CLASSID and move
it outside of traffic scheduling context to get rid of the NET_SCHED dependeny.
Reported-by: Vladis Kletnieks <Valdis.Kletnieks@vt.edu>
Signed-off-by: Patrick McHardy <kaber@trash.net>
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 a36270a..4b753ef 100644 --- a/net/sched/Kconfig +++ b/net/sched/Kconfig @@ -243,7 +243,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 @@ -252,9 +252,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 |