Browse Source

netfilter: Kconfig: get rid of parens around depends on

According to the reporter, they are not needed.

Reported-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Pablo Neira Ayuso 10 years ago
parent
commit
f09becc79f
3 changed files with 13 additions and 11 deletions
  1. 2 1
      net/ipv4/netfilter/Kconfig
  2. 2 1
      net/ipv6/netfilter/Kconfig
  3. 9 9
      net/netfilter/Kconfig

+ 2 - 1
net/ipv4/netfilter/Kconfig

@@ -195,7 +195,8 @@ config IP_NF_MATCH_ECN
 
 
 config IP_NF_MATCH_RPFILTER
 config IP_NF_MATCH_RPFILTER
 	tristate '"rpfilter" reverse path filter match support'
 	tristate '"rpfilter" reverse path filter match support'
-	depends on NETFILTER_ADVANCED && (IP_NF_MANGLE || IP_NF_RAW)
+	depends on NETFILTER_ADVANCED
+	depends on IP_NF_MANGLE || IP_NF_RAW
 	---help---
 	---help---
 	  This option allows you to match packets whose replies would
 	  This option allows you to match packets whose replies would
 	  go out via the interface the packet came in.
 	  go out via the interface the packet came in.

+ 2 - 1
net/ipv6/netfilter/Kconfig

@@ -186,7 +186,8 @@ config IP6_NF_MATCH_MH
 
 
 config IP6_NF_MATCH_RPFILTER
 config IP6_NF_MATCH_RPFILTER
 	tristate '"rpfilter" reverse path filter match support'
 	tristate '"rpfilter" reverse path filter match support'
-	depends on NETFILTER_ADVANCED && (IP6_NF_MANGLE || IP6_NF_RAW)
+	depends on NETFILTER_ADVANCED
+	depends on IP6_NF_MANGLE || IP6_NF_RAW
 	---help---
 	---help---
 	  This option allows you to match packets whose replies would
 	  This option allows you to match packets whose replies would
 	  go out via the interface the packet came in.
 	  go out via the interface the packet came in.

+ 9 - 9
net/netfilter/Kconfig

@@ -206,7 +206,7 @@ config NF_CONNTRACK_FTP
 
 
 config NF_CONNTRACK_H323
 config NF_CONNTRACK_H323
 	tristate "H.323 protocol support"
 	tristate "H.323 protocol support"
-	depends on (IPV6 || IPV6=n)
+	depends on IPV6 || IPV6=n
 	depends on NETFILTER_ADVANCED
 	depends on NETFILTER_ADVANCED
 	help
 	help
 	  H.323 is a VoIP signalling protocol from ITU-T. As one of the most
 	  H.323 is a VoIP signalling protocol from ITU-T. As one of the most
@@ -723,7 +723,7 @@ config NETFILTER_XT_TARGET_HL
 
 
 config NETFILTER_XT_TARGET_HMARK
 config NETFILTER_XT_TARGET_HMARK
 	tristate '"HMARK" target support'
 	tristate '"HMARK" target support'
-	depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
+	depends on IP6_NF_IPTABLES || IP6_NF_IPTABLES=n
 	depends on NETFILTER_ADVANCED
 	depends on NETFILTER_ADVANCED
 	---help---
 	---help---
 	This option adds the "HMARK" target.
 	This option adds the "HMARK" target.
@@ -865,7 +865,7 @@ config NETFILTER_XT_TARGET_REDIRECT
 config NETFILTER_XT_TARGET_TEE
 config NETFILTER_XT_TARGET_TEE
 	tristate '"TEE" - packet cloning to alternate destination'
 	tristate '"TEE" - packet cloning to alternate destination'
 	depends on NETFILTER_ADVANCED
 	depends on NETFILTER_ADVANCED
-	depends on (IPV6 || IPV6=n)
+	depends on IPV6 || IPV6=n
 	depends on !NF_CONNTRACK || NF_CONNTRACK
 	depends on !NF_CONNTRACK || NF_CONNTRACK
 	---help---
 	---help---
 	This option adds a "TEE" target with which a packet can be cloned and
 	This option adds a "TEE" target with which a packet can be cloned and
@@ -875,8 +875,8 @@ config NETFILTER_XT_TARGET_TPROXY
 	tristate '"TPROXY" target transparent proxying support'
 	tristate '"TPROXY" target transparent proxying support'
 	depends on NETFILTER_XTABLES
 	depends on NETFILTER_XTABLES
 	depends on NETFILTER_ADVANCED
 	depends on NETFILTER_ADVANCED
-	depends on (IPV6 || IPV6=n)
-	depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
+	depends on IPV6 || IPV6=n
+	depends on IP6_NF_IPTABLES || IP6_NF_IPTABLES=n
 	depends on IP_NF_MANGLE
 	depends on IP_NF_MANGLE
 	select NF_DEFRAG_IPV4
 	select NF_DEFRAG_IPV4
 	select NF_DEFRAG_IPV6 if IP6_NF_IPTABLES
 	select NF_DEFRAG_IPV6 if IP6_NF_IPTABLES
@@ -915,7 +915,7 @@ config NETFILTER_XT_TARGET_SECMARK
 
 
 config NETFILTER_XT_TARGET_TCPMSS
 config NETFILTER_XT_TARGET_TCPMSS
 	tristate '"TCPMSS" target support'
 	tristate '"TCPMSS" target support'
-	depends on (IPV6 || IPV6=n)
+	depends on IPV6 || IPV6=n
 	default m if NETFILTER_ADVANCED=n
 	default m if NETFILTER_ADVANCED=n
 	---help---
 	---help---
 	  This option adds a `TCPMSS' target, which allows you to alter the
 	  This option adds a `TCPMSS' target, which allows you to alter the
@@ -1127,7 +1127,7 @@ config NETFILTER_XT_MATCH_ESP
 
 
 config NETFILTER_XT_MATCH_HASHLIMIT
 config NETFILTER_XT_MATCH_HASHLIMIT
 	tristate '"hashlimit" match support'
 	tristate '"hashlimit" match support'
-	depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
+	depends on IP6_NF_IPTABLES || IP6_NF_IPTABLES=n
 	depends on NETFILTER_ADVANCED
 	depends on NETFILTER_ADVANCED
 	help
 	help
 	  This option adds a `hashlimit' match.
 	  This option adds a `hashlimit' match.
@@ -1369,8 +1369,8 @@ config NETFILTER_XT_MATCH_SOCKET
 	depends on NETFILTER_XTABLES
 	depends on NETFILTER_XTABLES
 	depends on NETFILTER_ADVANCED
 	depends on NETFILTER_ADVANCED
 	depends on !NF_CONNTRACK || NF_CONNTRACK
 	depends on !NF_CONNTRACK || NF_CONNTRACK
-	depends on (IPV6 || IPV6=n)
-	depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
+	depends on IPV6 || IPV6=n
+	depends on IP6_NF_IPTABLES || IP6_NF_IPTABLES=n
 	select NF_DEFRAG_IPV4
 	select NF_DEFRAG_IPV4
 	select NF_DEFRAG_IPV6 if IP6_NF_IPTABLES
 	select NF_DEFRAG_IPV6 if IP6_NF_IPTABLES
 	help
 	help