Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 8aa53cb3a5469868fc0145e9aaf4ac3847aad5c4

Authored by Kees Cook
Committed by Greg Kroah-Hartman
1 parent 91d09454b1
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

drivers/net/ppp: remove depends on CONFIG_EXPERIMENTAL 

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.

Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 1 changed file with 10 additions and 10 deletions Side-by-side Diff

drivers/net/ppp/Kconfig
Diff comments   View file @ 8aa53cb
... ... @@ -82,8 +82,8 @@
82 82 If unsure, say N.
83 83  
84 84 config PPP_MPPE
85   - tristate "PPP MPPE compression (encryption) (EXPERIMENTAL)"
86   - depends on PPP && EXPERIMENTAL
  85 + tristate "PPP MPPE compression (encryption)"
  86 + depends on PPP
87 87 select CRYPTO
88 88 select CRYPTO_SHA1
89 89 select CRYPTO_ARC4
... ... @@ -96,8 +96,8 @@
96 96 configuring PPTP clients and servers to utilize this method.
97 97  
98 98 config PPP_MULTILINK
99   - bool "PPP multilink support (EXPERIMENTAL)"
100   - depends on PPP && EXPERIMENTAL
  99 + bool "PPP multilink support"
  100 + depends on PPP
101 101 ---help---
102 102 PPP multilink is a protocol (defined in RFC 1990) which allows you
103 103 to combine several (logical or physical) lines into one logical PPP
... ... @@ -118,8 +118,8 @@
118 118 changes its encapsulation unilaterally.
119 119  
120 120 config PPPOE
121   - tristate "PPP over Ethernet (EXPERIMENTAL)"
122   - depends on EXPERIMENTAL && PPP
  121 + tristate "PPP over Ethernet"
  122 + depends on PPP
123 123 ---help---
124 124 Support for PPP over Ethernet.
125 125  
... ... @@ -130,8 +130,8 @@
130 130 the heading "Kernel mode PPPoE").
131 131  
132 132 config PPTP
133   - tristate "PPP over IPv4 (PPTP) (EXPERIMENTAL)"
134   - depends on EXPERIMENTAL && PPP && NET_IPGRE_DEMUX
  133 + tristate "PPP over IPv4 (PPTP)"
  134 + depends on PPP && NET_IPGRE_DEMUX
135 135 ---help---
136 136 Support for PPP over IPv4.(Point-to-Point Tunneling Protocol)
137 137  
... ... @@ -141,8 +141,8 @@
141 141 utilize this module.
142 142  
143 143 config PPPOL2TP
144   - tristate "PPP over L2TP (EXPERIMENTAL)"
145   - depends on EXPERIMENTAL && L2TP && PPP
  144 + tristate "PPP over L2TP"
  145 + depends on L2TP && PPP
146 146 ---help---
147 147 Support for PPP-over-L2TP socket family. L2TP is a protocol
148 148 used by ISPs and enterprises to tunnel PPP traffic over UDP