Pārlūkot izejas kodu

netfilter: fix kconfig unmet dependency warning

Fix netfilter kconfig unmet dependencies warning & spell out
"compatible" while there.

warning: (IP_NF_TARGET_TTL && NET && INET && NETFILTER && IP_NF_IPTABLES && NETFILTER_ADVANCED || IP6_NF_TARGET_HL && NET && INET && IPV6 && NETFILTER && IP6_NF_IPTABLES && NETFILTER_ADVANCED) selects NETFILTER_XT_TARGET_HL which has unmet direct dependencies ((IP_NF_MANGLE || IP6_NF_MANGLE) && NETFILTER_ADVANCED)

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Randy Dunlap 15 gadi atpakaļ
vecāks
revīzija
76b6717bc6
2 mainītis faili ar 4 papildinājumiem un 4 dzēšanām
  1. 2 2
      net/ipv4/netfilter/Kconfig
  2. 2 2
      net/ipv6/netfilter/Kconfig

+ 2 - 2
net/ipv4/netfilter/Kconfig

@@ -324,10 +324,10 @@ config IP_NF_TARGET_ECN
 
 
 config IP_NF_TARGET_TTL
 config IP_NF_TARGET_TTL
 	tristate '"TTL" target support'
 	tristate '"TTL" target support'
-	depends on NETFILTER_ADVANCED
+	depends on NETFILTER_ADVANCED && IP_NF_MANGLE
 	select NETFILTER_XT_TARGET_HL
 	select NETFILTER_XT_TARGET_HL
 	---help---
 	---help---
-	This is a backwards-compat option for the user's convenience
+	This is a backwards-compatible option for the user's convenience
 	(e.g. when running oldconfig). It selects
 	(e.g. when running oldconfig). It selects
 	CONFIG_NETFILTER_XT_TARGET_HL.
 	CONFIG_NETFILTER_XT_TARGET_HL.
 
 

+ 2 - 2
net/ipv6/netfilter/Kconfig

@@ -132,10 +132,10 @@ config IP6_NF_MATCH_RT
 # The targets
 # The targets
 config IP6_NF_TARGET_HL
 config IP6_NF_TARGET_HL
 	tristate '"HL" hoplimit target support'
 	tristate '"HL" hoplimit target support'
-	depends on NETFILTER_ADVANCED
+	depends on NETFILTER_ADVANCED && IP6_NF_MANGLE
 	select NETFILTER_XT_TARGET_HL
 	select NETFILTER_XT_TARGET_HL
 	---help---
 	---help---
-	This is a backwards-compat option for the user's convenience
+	This is a backwards-compatible option for the user's convenience
 	(e.g. when running oldconfig). It selects
 	(e.g. when running oldconfig). It selects
 	CONFIG_NETFILTER_XT_TARGET_HL.
 	CONFIG_NETFILTER_XT_TARGET_HL.