sh: Support for SH-4A memory barriers.

[powerpc.git] / net / Kconfig

diff --git a/net/Kconfig b/net/Kconfig
index ccadc8e..6528a93 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -66,6 +66,13 @@ source "net/ipv6/Kconfig"
 
 endif # if INET
 
+config NETWORK_SECMARK
+       bool "Security Marking"
+       help
+         This enables security marking of network packets, similar
+         to nfmark, but designated for security purposes.
+         If you are unsure how to answer this question, answer N.
+
 menuconfig NETFILTER
        bool "Network packet filtering (replaces ipchains)"
        ---help---
@@ -170,7 +177,7 @@ source "net/lapb/Kconfig"
 
 config NET_DIVERT
        bool "Frame Diverter (EXPERIMENTAL)"
-       depends on EXPERIMENTAL
+       depends on EXPERIMENTAL && BROKEN
        ---help---
          The Frame Diverter allows you to divert packets from the
          network, that are not aimed at the interface receiving it (in
@@ -242,6 +249,11 @@ source "net/ieee80211/Kconfig"
 config WIRELESS_EXT
        bool
 
+source "net/netlabel/Kconfig"
+
+config FIB_RULES
+       bool
+
 endif   # if NET
 endmenu # Networking