[DCCP]: Increment sequence numbers on retransmitted Response packets

[powerpc.git] / net / Kconfig

diff --git a/net/Kconfig b/net/Kconfig
index ccadc8e..67e39ad 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -63,9 +63,17 @@ config INET
 if INET
 source "net/ipv4/Kconfig"
 source "net/ipv6/Kconfig"
+source "net/netlabel/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 +178,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
@@ -224,7 +232,7 @@ config NET_TCPPROBE
        TCP congestion avoidance modules. If you don't understand
        what was just said, you don't need it: say N.
 
-       Documentation on how to use the packet generator can be found
+       Documentation on how to use TCP connection probing can be found
        at http://linux-net.osdl.org/index.php/TcpProbe
 
        To compile this code as a module, choose M here: the
@@ -242,6 +250,9 @@ source "net/ieee80211/Kconfig"
 config WIRELESS_EXT
        bool
 
+config FIB_RULES
+       bool
+
 endif   # if NET
 endmenu # Networking