diff options
author | Kees Cook <keescook@chromium.org> | 2012-10-02 14:17:55 -0400 |
---|---|---|
committer | Kees Cook <keescook@chromium.org> | 2013-01-11 14:38:07 -0500 |
commit | bd085b93851c69e984dc11a9fb359ee388c1e7d2 (patch) | |
tree | ad5ad050524c6f05d2a355aef589cab66b51bfb7 /drivers/net/Kconfig | |
parent | 5d0e137dc049c71121119cea4499175a91ed74fd (diff) |
drivers/net: 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.
CC: "David S. Miller" <davem@davemloft.net>
CC: Stephen Hemminger <shemminger@vyatta.com>
CC: Paul Gortmaker <paul.gortmaker@windriver.com>
CC: Mike Sterling <Mike.Sterling@microsoft.com>
CC: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
Acked-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/Kconfig')
-rw-r--r-- | drivers/net/Kconfig | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 6a70184c3f23..2334190ff8d2 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -123,8 +123,7 @@ config IFB | |||
123 | source "drivers/net/team/Kconfig" | 123 | source "drivers/net/team/Kconfig" |
124 | 124 | ||
125 | config MACVLAN | 125 | config MACVLAN |
126 | tristate "MAC-VLAN support (EXPERIMENTAL)" | 126 | tristate "MAC-VLAN support" |
127 | depends on EXPERIMENTAL | ||
128 | ---help--- | 127 | ---help--- |
129 | This allows one to create virtual interfaces that map packets to | 128 | This allows one to create virtual interfaces that map packets to |
130 | or from specific MAC addresses to a particular interface. | 129 | or from specific MAC addresses to a particular interface. |
@@ -138,7 +137,7 @@ config MACVLAN | |||
138 | will be called macvlan. | 137 | will be called macvlan. |
139 | 138 | ||
140 | config MACVTAP | 139 | config MACVTAP |
141 | tristate "MAC-VLAN based tap driver (EXPERIMENTAL)" | 140 | tristate "MAC-VLAN based tap driver" |
142 | depends on MACVLAN | 141 | depends on MACVLAN |
143 | help | 142 | help |
144 | This adds a specialized tap character device driver that is based | 143 | This adds a specialized tap character device driver that is based |
@@ -234,8 +233,8 @@ config VETH | |||
234 | versa. | 233 | versa. |
235 | 234 | ||
236 | config VIRTIO_NET | 235 | config VIRTIO_NET |
237 | tristate "Virtio network driver (EXPERIMENTAL)" | 236 | tristate "Virtio network driver" |
238 | depends on EXPERIMENTAL && VIRTIO | 237 | depends on VIRTIO |
239 | ---help--- | 238 | ---help--- |
240 | This is the virtual network driver for virtio. It can be used with | 239 | This is the virtual network driver for virtio. It can be used with |
241 | lguest or QEMU based VMMs (like KVM or Xen). Say Y or M. | 240 | lguest or QEMU based VMMs (like KVM or Xen). Say Y or M. |