From: Eric W Biederman <ebied...@xmission.com>
Don't allow network namespaces and netfilter to both be
enabled. This allows the netfilter code to be bisected
through while per network namespace netfilter hooks are
being implemented.
Signed-off-by: "Eric W. Biederman" <ebied...@xmission.com>
---
init/Kconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/init/Kconfig b/init/Kconfig
index dc24dec60232..166cfbfdc2df 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1207,6 +1207,7 @@ config PID_NS
config NET_NS
bool "Network namespace"
depends on NET
+ depends on !NETFILTER
default y
help
Allow user space to create what appear to be multiple instances
--
2.2.1
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
