Merge tag 'backlight-for-linus-4.2' of git://git.kernel.org/pub/scm/linux/kernel...

[deliverable/linux.git] / net / netfilter / Kconfig

diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index f70e34a68f702ab39c43e27d4b8e8127b49525f6..6eae69a698ed8344fee68a46e767a2393e53148a 100644 (file)
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -1,6 +1,14 @@
 menu "Core Netfilter Configuration"
        depends on NET && INET && NETFILTER
 
+config NETFILTER_INGRESS
+       bool "Netfilter ingress support"
+       default y
+       select NET_INGRESS
+       help
+         This allows you to classify packets from ingress using the Netfilter
+         infrastructure.
+
 config NETFILTER_NETLINK
        tristate
 
@@ -198,7 +206,7 @@ config NF_CONNTRACK_FTP
 
 config NF_CONNTRACK_H323
        tristate "H.323 protocol support"
-       depends on (IPV6 || IPV6=n)
+       depends on IPV6 || IPV6=n
        depends on NETFILTER_ADVANCED
        help
          H.323 is a VoIP signalling protocol from ITU-T. As one of the most
@@ -448,6 +456,11 @@ config NF_TABLES_INET
        help
          This option enables support for a mixed IPv4/IPv6 "inet" table.
 
+config NF_TABLES_NETDEV
+       tristate "Netfilter nf_tables netdev tables support"
+       help
+         This option enables support for the "netdev" table.
+
 config NFT_EXTHDR
        tristate "Netfilter nf_tables IPv6 exthdr module"
        help
@@ -710,7 +723,7 @@ config NETFILTER_XT_TARGET_HL
 
 config NETFILTER_XT_TARGET_HMARK
        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
        ---help---
        This option adds the "HMARK" target.
@@ -852,7 +865,7 @@ config NETFILTER_XT_TARGET_REDIRECT
 config NETFILTER_XT_TARGET_TEE
        tristate '"TEE" - packet cloning to alternate destination'
        depends on NETFILTER_ADVANCED
-       depends on (IPV6 || IPV6=n)
+       depends on IPV6 || IPV6=n
        depends on !NF_CONNTRACK || NF_CONNTRACK
        ---help---
        This option adds a "TEE" target with which a packet can be cloned and
@@ -862,7 +875,8 @@ config NETFILTER_XT_TARGET_TPROXY
        tristate '"TPROXY" target transparent proxying support'
        depends on NETFILTER_XTABLES
        depends on NETFILTER_ADVANCED
-       depends on (IPV6 || IPV6=n)
+       depends on IPV6 || IPV6=n
+       depends on IP6_NF_IPTABLES || IP6_NF_IPTABLES=n
        depends on IP_NF_MANGLE
        select NF_DEFRAG_IPV4
        select NF_DEFRAG_IPV6 if IP6_NF_IPTABLES
@@ -901,7 +915,7 @@ config NETFILTER_XT_TARGET_SECMARK
 
 config NETFILTER_XT_TARGET_TCPMSS
        tristate '"TCPMSS" target support'
-       depends on (IPV6 || IPV6=n)
+       depends on IPV6 || IPV6=n
        default m if NETFILTER_ADVANCED=n
        ---help---
          This option adds a `TCPMSS' target, which allows you to alter the
@@ -1113,7 +1127,7 @@ config NETFILTER_XT_MATCH_ESP
 
 config NETFILTER_XT_MATCH_HASHLIMIT
        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
        help
          This option adds a `hashlimit' match.
@@ -1355,7 +1369,8 @@ config NETFILTER_XT_MATCH_SOCKET
        depends on NETFILTER_XTABLES
        depends on NETFILTER_ADVANCED
        depends on !NF_CONNTRACK || NF_CONNTRACK
-       depends on (IPV6 || IPV6=n)
+       depends on IPV6 || IPV6=n
+       depends on IP6_NF_IPTABLES || IP6_NF_IPTABLES=n
        select NF_DEFRAG_IPV4
        select NF_DEFRAG_IPV6 if IP6_NF_IPTABLES
        help