From 5ea825e9a62a3f4876446f27ef7aba36a291c417 Mon Sep 17 00:00:00 2001 From: Kees Cook Date: Tue, 22 Jan 2013 10:30:34 -0800 Subject: [PATCH] --- yaml --- r: 353691 b: refs/heads/master c: 8aa53cb3a5469868fc0145e9aaf4ac3847aad5c4 h: refs/heads/master i: 353689: b5a480fcb69839a82b59c94b16f5ad47a7853a3e 353687: 6ffc11da16043da512ab627f333ac3e3e7bf509e v: v3 --- [refs] | 2 +- trunk/drivers/net/ppp/Kconfig | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 63ebf91cfc16..fdcabb894c9a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 91d09454b146e986d917e638781f3e759c6647f6 +refs/heads/master: 8aa53cb3a5469868fc0145e9aaf4ac3847aad5c4 diff --git a/trunk/drivers/net/ppp/Kconfig b/trunk/drivers/net/ppp/Kconfig index 872df3ef07a6..278dea0c4c98 100644 --- a/trunk/drivers/net/ppp/Kconfig +++ b/trunk/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. config PPP_MULTILINK - bool "PPP multilink support (EXPERIMENTAL)" - depends on PPP && EXPERIMENTAL + bool "PPP multilink support" + depends on PPP ---help--- 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 ---help--- Support for PPP over Ethernet. @@ -130,8 +130,8 @@ config PPPOE the heading "Kernel mode PPPoE"). config PPTP - tristate "PPP over IPv4 (PPTP) (EXPERIMENTAL)" - depends on EXPERIMENTAL && PPP && NET_IPGRE_DEMUX + tristate "PPP over IPv4 (PPTP)" + depends on PPP && NET_IPGRE_DEMUX ---help--- 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 ---help--- Support for PPP-over-L2TP socket family. L2TP is a protocol used by ISPs and enterprises to tunnel PPP traffic over UDP