aboutsummaryrefslogtreecommitdiffstats
path: root/net/netfilter/Kconfig
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2014-06-28 18:39:01 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2014-06-28 18:49:49 +0200
commitc1878869c0c8e0def3df5397155f369442ce4e06 (patch)
treecd538dffb0cb94e2597c6d6b64e807a476c66405 /net/netfilter/Kconfig
parentnetfilter: nft_log: complete logging support (diff)
downloadlinux-dev-c1878869c0c8e0def3df5397155f369442ce4e06.tar.xz
linux-dev-c1878869c0c8e0def3df5397155f369442ce4e06.zip
netfilter: fix several Kconfig problems in NF_LOG_*
warning: (NETFILTER_XT_TARGET_LOG) selects NF_LOG_IPV6 which has unmet direct dependencies (NET && INET && IPV6 && NETFILTER && IP6_NF_IPTABLES && NETFILTER_ADVANCED) warning: (NF_LOG_IPV4 && NF_LOG_IPV6) selects NF_LOG_COMMON which has unmet direct dependencies (NET && INET && NETFILTER && NF_CONNTRACK) Fixes: 83e96d4 ("netfilter: log: split family specific code to nf_log_{ip,ip6,common}.c files") Reported-by: Fengguang Wu <fengguang.wu@intel.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter/Kconfig')
-rw-r--r--net/netfilter/Kconfig10
1 files changed, 4 insertions, 6 deletions
diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index f17b273c9082..ad751fe2e82b 100644
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -46,6 +46,9 @@ config NF_CONNTRACK
To compile it as a module, choose M here. If unsure, say N.
+config NF_LOG_COMMON
+ tristate
+
if NF_CONNTRACK
config NF_CONNTRACK_MARK
@@ -359,9 +362,6 @@ config NETFILTER_NETLINK_QUEUE_CT
If this option is enabled, NFQUEUE can include Connection Tracking
information together with the packet is the enqueued via NFNETLINK.
-config NF_LOG_COMMON
- tristate
-
config NF_NAT
tristate
@@ -747,9 +747,7 @@ config NETFILTER_XT_TARGET_LED
config NETFILTER_XT_TARGET_LOG
tristate "LOG target support"
- select NF_LOG
- select NF_LOG_IPV4
- select NF_LOG_IPV6
+ depends on NF_LOG_IPV4 && NF_LOG_IPV6
default m if NETFILTER_ADVANCED=n
help
This option adds a `LOG' target, which allows you to create rules in