Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/dccp_exp

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / net / dccp / Kconfig

diff --git a/net/dccp/Kconfig b/net/dccp/Kconfig
index b8a68dd41000348f58ec5215c35761098a1bb68c..206c16ad9c3cd7265aa93ab81ab1e6a2d0c29684 100644 (file)
--- a/net/dccp/Kconfig
+++ b/net/dccp/Kconfig
@@ -1,8 +1,7 @@
-menu "DCCP Configuration (EXPERIMENTAL)"
-       depends on INET && EXPERIMENTAL
-
-config IP_DCCP
+menuconfig IP_DCCP
        tristate "The DCCP Protocol (EXPERIMENTAL)"
+       depends on INET && EXPERIMENTAL
+       select IP_DCCP_CCID2
        ---help---
          Datagram Congestion Control Protocol (RFC 4340)
 
@@ -19,19 +18,17 @@ config IP_DCCP
 
          If in doubt, say N.
 
+if IP_DCCP
+
 config INET_DCCP_DIAG
-       depends on IP_DCCP && INET_DIAG
+       depends on INET_DIAG
        def_tristate y if (IP_DCCP = y && INET_DIAG = y)
        def_tristate m
 
-config IP_DCCP_ACKVEC
-       depends on IP_DCCP
-       bool
-
 source "net/dccp/ccids/Kconfig"
 
 menu "DCCP Kernel Hacking"
-       depends on IP_DCCP && DEBUG_KERNEL=y
+       depends on DEBUG_KERNEL=y
 
 config IP_DCCP_DEBUG
        bool "DCCP debug messages"
@@ -61,4 +58,4 @@ config NET_DCCPPROBE
 
 endmenu
 
-endmenu
+endif # IP_DDCP