Browse Source

[NETFILTER]: Select CONFIG_NETFILTER_NETLINK when needed

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Patrick McHardy 17 years ago
parent
commit
2eeeba390a
1 changed files with 5 additions and 8 deletions
  1. 5 8
      net/netfilter/Kconfig

+ 5 - 8
net/netfilter/Kconfig

@@ -2,21 +2,18 @@ menu "Core Netfilter Configuration"
 	depends on NET && INET && NETFILTER
 	depends on NET && INET && NETFILTER
 
 
 config NETFILTER_NETLINK
 config NETFILTER_NETLINK
-       tristate "Netfilter netlink interface"
-       help
-         If this option is enabled, the kernel will include support
-         for the new netfilter netlink interface.
+	tristate
 
 
 config NETFILTER_NETLINK_QUEUE
 config NETFILTER_NETLINK_QUEUE
 	tristate "Netfilter NFQUEUE over NFNETLINK interface"
 	tristate "Netfilter NFQUEUE over NFNETLINK interface"
-	depends on NETFILTER_NETLINK
+	select NETFILTER_NETLINK
 	help
 	help
 	  If this option is enabled, the kernel will include support
 	  If this option is enabled, the kernel will include support
 	  for queueing packets via NFNETLINK.
 	  for queueing packets via NFNETLINK.
 	  
 	  
 config NETFILTER_NETLINK_LOG
 config NETFILTER_NETLINK_LOG
 	tristate "Netfilter LOG over NFNETLINK interface"
 	tristate "Netfilter LOG over NFNETLINK interface"
-	depends on NETFILTER_NETLINK
+	select NETFILTER_NETLINK
 	help
 	help
 	  If this option is enabled, the kernel will include support
 	  If this option is enabled, the kernel will include support
 	  for logging packets via NFNETLINK.
 	  for logging packets via NFNETLINK.
@@ -246,8 +243,8 @@ config NF_CONNTRACK_TFTP
 
 
 config NF_CT_NETLINK
 config NF_CT_NETLINK
 	tristate 'Connection tracking netlink interface (EXPERIMENTAL)'
 	tristate 'Connection tracking netlink interface (EXPERIMENTAL)'
-	depends on EXPERIMENTAL && NF_CONNTRACK && NETFILTER_NETLINK
-	depends on NF_CONNTRACK!=y || NETFILTER_NETLINK!=m
+	depends on EXPERIMENTAL && NF_CONNTRACK
+	select NETFILTER_NETLINK
 	depends on NF_NAT=n || NF_NAT
 	depends on NF_NAT=n || NF_NAT
 	help
 	help
 	  This option enables support for a netlink-based userspace interface
 	  This option enables support for a netlink-based userspace interface