[10/20] drivers/net/ppp: remove depends on CONFIG_EXPERIMENTAL

Message ID 1358879444-25834-11-git-send-email-keescook@chromium.org
State Not Applicable, archived
Delegated to: David Miller
Headers show

Commit Message

Kees Cook Jan. 22, 2013, 6:30 p.m.
The CONFIG_EXPERIMENTAL config item has not carried much meaning for a
while now and is almost always enabled by default. As agreed during the
Linux kernel summit, remove it from any "depends on" lines in Kconfigs.

Cc: "David S. Miller" <davem@davemloft.net>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: NetDev <netdev@vger.kernel.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
 drivers/net/ppp/Kconfig |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)


diff --git a/drivers/net/ppp/Kconfig b/drivers/net/ppp/Kconfig
index 3d9ef4f..1373c6d 100644
--- a/drivers/net/ppp/Kconfig
+++ b/drivers/net/ppp/Kconfig
@@ -82,8 +82,8 @@  config PPP_FILTER
 	  If unsure, say N.
 config PPP_MPPE
-	tristate "PPP MPPE compression (encryption) (EXPERIMENTAL)"
-	depends on PPP && EXPERIMENTAL
+	tristate "PPP MPPE compression (encryption)"
+	depends on PPP
 	select CRYPTO
 	select CRYPTO_SHA1
 	select CRYPTO_ARC4
@@ -96,8 +96,8 @@  config PPP_MPPE
 	  configuring PPTP clients and servers to utilize this method.
-	bool "PPP multilink support (EXPERIMENTAL)"
-	depends on PPP && EXPERIMENTAL
+	bool "PPP multilink support"
+	depends on PPP
 	  PPP multilink is a protocol (defined in RFC 1990) which allows you
 	  to combine several (logical or physical) lines into one logical PPP
@@ -118,8 +118,8 @@  config PPPOATM
 	  changes its encapsulation unilaterally.
 config PPPOE
-	tristate "PPP over Ethernet (EXPERIMENTAL)"
-	depends on EXPERIMENTAL && PPP
+	tristate "PPP over Ethernet"
+	depends on PPP
 	  Support for PPP over Ethernet.
@@ -130,8 +130,8 @@  config PPPOE
 	  the heading "Kernel mode PPPoE").
 config PPTP
-	tristate "PPP over IPv4 (PPTP) (EXPERIMENTAL)"
+	tristate "PPP over IPv4 (PPTP)"
+	depends on PPP && NET_IPGRE_DEMUX
 	  Support for PPP over IPv4.(Point-to-Point Tunneling Protocol)
@@ -141,8 +141,8 @@  config PPTP
 	  utilize this module.
 config PPPOL2TP
-	tristate "PPP over L2TP (EXPERIMENTAL)"
-	depends on EXPERIMENTAL && L2TP && PPP
+	tristate "PPP over L2TP"
+	depends on L2TP && PPP
 	  Support for PPP-over-L2TP socket family. L2TP is a protocol
 	  used by ISPs and enterprises to tunnel PPP traffic over UDP