sctp: Fix kernel panic while process protocol violation parameter

[safe/jmp/linux-2.6] / net / sctp / Kconfig

diff --git a/net/sctp/Kconfig b/net/sctp/Kconfig
index 9cba49e..58b3e88 100644 (file)
--- a/net/sctp/Kconfig
+++ b/net/sctp/Kconfig
@@ -2,16 +2,15 @@
 # SCTP configuration
 #
 
-menu "SCTP Configuration (EXPERIMENTAL)"
-       depends on INET && EXPERIMENTAL
-
-config IP_SCTP
+menuconfig IP_SCTP
        tristate "The SCTP Protocol (EXPERIMENTAL)"
+       depends on INET && EXPERIMENTAL
        depends on IPV6 || IPV6=n
-       select CRYPTO if SCTP_HMAC_SHA1 || SCTP_HMAC_MD5
-       select CRYPTO_HMAC if SCTP_HMAC_SHA1 || SCTP_HMAC_MD5
-       select CRYPTO_SHA1 if SCTP_HMAC_SHA1
+       select CRYPTO
+       select CRYPTO_HMAC
+       select CRYPTO_SHA1
        select CRYPTO_MD5 if SCTP_HMAC_MD5
+       select LIBCRC32C
        ---help---
          Stream Control Transmission Protocol
 
@@ -36,9 +35,10 @@ config IP_SCTP
 
          If in doubt, say N.
 
+if IP_SCTP
+
 config SCTP_DBG_MSG
        bool "SCTP: Debug messages"
-       depends on IP_SCTP
        help
          If you say Y, this will enable verbose debugging messages. 
 
@@ -47,19 +47,17 @@ config SCTP_DBG_MSG
 
 config SCTP_DBG_OBJCNT
        bool "SCTP: Debug object counts"
-       depends on IP_SCTP
+       depends on PROC_FS
        help
          If you say Y, this will enable debugging support for counting the 
          type of objects that are currently allocated.  This is useful for 
-         identifying memory leaks.   If the /proc filesystem is enabled this 
-         debug information can be viewed by 
+         identifying memory leaks. This debug information can be viewed by
          'cat /proc/net/sctp/sctp_dbg_objcnt'
 
          If unsure, say N
 
 choice
        prompt "SCTP: Cookie HMAC Algorithm"
-       depends on IP_SCTP
        default SCTP_HMAC_MD5
        help
          HMAC algorithm to be used during association initialization.  It
@@ -86,4 +84,5 @@ config SCTP_HMAC_MD5
          advised to use either HMAC-MD5 or HMAC-SHA1.
 
 endchoice
-endmenu
+
+endif # IP_SCTP