Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

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

diff --git a/net/bridge/netfilter/Kconfig b/net/bridge/netfilter/Kconfig
index 68ccef5..b84fc60 100644 (file)
--- a/net/bridge/netfilter/Kconfig
+++ b/net/bridge/netfilter/Kconfig
@@ -138,7 +138,7 @@ config BRIDGE_EBT_VLAN
 #
 config BRIDGE_EBT_ARPREPLY
        tristate "ebt: arp reply target support"
 #
 config BRIDGE_EBT_ARPREPLY
        tristate "ebt: arp reply target support"

-       depends on BRIDGE_NF_EBTABLES
+       depends on BRIDGE_NF_EBTABLES && INET

        help
          This option adds the arp reply target, which allows
          automatically sending arp replies to arp requests.
        help
          This option adds the arp reply target, which allows
          automatically sending arp replies to arp requests.


@@ -196,9 +196,13 @@ config BRIDGE_EBT_LOG
          To compile it as a module, choose M here.  If unsure, say N.
 
 config BRIDGE_EBT_ULOG
          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
        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
          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