aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/Kconfig
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2011-01-14 13:36:42 +0100
committerPatrick McHardy <kaber@trash.net>2011-01-14 13:36:42 +0100
commitc7066f70d9610df0b9406cc635fc09e86136e714 (patch)
treece98855b2c1ba2da15b7b47fc7a447d1903c4d89 /net/ipv4/Kconfig
parentnetfilter: fix compilation when conntrack is disabled but tproxy is enabled (diff)
downloadlinux-dev-c7066f70d9610df0b9406cc635fc09e86136e714.tar.xz
linux-dev-c7066f70d9610df0b9406cc635fc09e86136e714.zip
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 '')
-rw-r--r--net/ipv4/Kconfig4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index 9e95d7fb6d5a..dcb2e18f6f8e 100644
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
@@ -140,6 +140,9 @@ config IP_ROUTE_VERBOSE
handled by the klogd daemon which is responsible for kernel messages
("man klogd").
+config IP_ROUTE_CLASSID
+ bool
+
config IP_PNP
bool "IP: kernel level autoconfiguration"
help
@@ -655,4 +658,3 @@ config TCP_MD5SIG
on the Internet.
If unsure, say N.
-