Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

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

diff --git a/net/Kconfig b/net/Kconfig
index ff0db804eed804b11667b8c1542b68d066af3cb9..c6cec5aa548604c87aa48ce43fd9c2007052f305 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---
@@ -220,7 +227,7 @@ config NET_TCPPROBE
        depends on INET && EXPERIMENTAL && PROC_FS && KPROBES
        ---help---
        This module allows for capturing the changes to TCP connection
-       state in response to incoming patckets. It is used for debugging
+       state in response to incoming packets. It is used for debugging
        TCP congestion avoidance modules. If you don't understand
        what was just said, you don't need it: say N.