Merge branch 'linux-3.17' of git://anongit.freedesktop.org/git/nouveau/linux-2.6...

[karo-tx-linux.git] / net / bridge / netfilter / Kconfig

diff --git a/net/bridge/netfilter/Kconfig b/net/bridge/netfilter/Kconfig
index 629dc77874a9975feed56bb7b6abefad76cfad94..9cebf47ac840722d0294713f98ef98595272f0be 100644 (file)
--- a/net/bridge/netfilter/Kconfig
+++ b/net/bridge/netfilter/Kconfig
@@ -14,6 +14,15 @@ config NFT_BRIDGE_META
        help
          Add support for bridge dedicated meta key.
 
+config NFT_BRIDGE_REJECT
+       tristate "Netfilter nf_tables bridge reject support"
+       depends on NFT_REJECT && NFT_REJECT_IPV4 && NFT_REJECT_IPV6
+       help
+         Add support to reject packets.
+
+config NF_LOG_BRIDGE
+       tristate "Bridge packet logging"
+
 endif # NF_TABLES_BRIDGE
 
 menuconfig BRIDGE_NF_EBTABLES
@@ -202,22 +211,6 @@ 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 (OBSOLETE)"
-       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
-         from the log watcher in the sense that the complete packet is
-         sent to userspace instead of a descriptive text and that
-         netlink multicast sockets are used instead of the syslog.
-
-         To compile it as a module, choose M here.  If unsure, say N.
-
 config BRIDGE_EBT_NFLOG
        tristate "ebt: nflog support"
        help