bridge: fix IPV6=n build

[linux-2.6-omap-h63xx.git] / net / bridge / netfilter / Kconfig

diff --git a/net/bridge/netfilter/Kconfig b/net/bridge/netfilter/Kconfig
index c70b3be230265fda2951a5d25bff0516c0921f4d..540df4106bec3164d516be36fa4f1732bb9cf2de 100644 (file)
--- a/net/bridge/netfilter/Kconfig
+++ b/net/bridge/netfilter/Kconfig
@@ -3,7 +3,7 @@
 #
 
 menu "Bridge: Netfilter Configuration"
-       depends on BRIDGE && NETFILTER
+       depends on BRIDGE && BRIDGE_NETFILTER
 
 config BRIDGE_NF_EBTABLES
        tristate "Ethernet Bridge tables (ebtables) support"
@@ -83,6 +83,15 @@ config BRIDGE_EBT_IP
 
          To compile it as a module, choose M here.  If unsure, say N.
 
+config BRIDGE_EBT_IP6
+       tristate "ebt: IP6 filter support"
+       depends on BRIDGE_NF_EBTABLES && IPV6
+       help
+         This option adds the IP6 match, which allows basic IPV6 header field
+         filtering.
+
+         To compile it as a module, choose M here.  If unsure, say N.
+
 config BRIDGE_EBT_LIMIT
        tristate "ebt: limit match support"
        depends on BRIDGE_NF_EBTABLES
@@ -196,9 +205,13 @@ config BRIDGE_EBT_LOG
          To compile it as a module, choose M here.  If unsure, say N.
 
 config BRIDGE_EBT_ULOG
-       tristate "ebt: ulog support"
+       tristate "ebt: ulog support (OBSOLETE)"
        depends on BRIDGE_NF_EBTABLES
        help
+         This option enables the old bridge-specific "ebt_ulog" implementation
+         which has been obsoleted by the new "nfnetlink_log" code (see
+         CONFIG_NETFILTER_NETLINK_LOG).
+
          This option adds the ulog watcher, that you can use in any rule
          in any ebtables table. The packet is passed to a userspace
          logging daemon using netlink multicast sockets. This differs
@@ -208,4 +221,18 @@ config BRIDGE_EBT_ULOG
 
          To compile it as a module, choose M here.  If unsure, say N.
 
+config BRIDGE_EBT_NFLOG
+       tristate "ebt: nflog support"
+       depends on BRIDGE_NF_EBTABLES
+       help
+         This option enables the nflog watcher, which allows to LOG
+         messages through the netfilter logging API, which can use
+         either the old LOG target, the old ULOG target or nfnetlink_log
+         as backend.
+
+         This option adds the ulog watcher, that you can use in any rule
+         in any ebtables table.
+
+         To compile it as a module, choose M here.  If unsure, say N.
+
 endmenu