This 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.

CC: "David S. Miller" <[email protected]>
CC: Stephen Hemminger <[email protected]>
CC: Paul Gortmaker <[email protected]>
CC: Mike Sterling <[email protected]>
CC: Lennert Buytenhek <[email protected]>
Signed-off-by: Kees Cook <[email protected]>
---
 drivers/net/Kconfig |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 6a70184..2334190 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -123,8 +123,7 @@ config IFB
 source "drivers/net/team/Kconfig"
 
 config MACVLAN
-       tristate "MAC-VLAN support (EXPERIMENTAL)"
-       depends on EXPERIMENTAL
+       tristate "MAC-VLAN support"
        ---help---
          This allows one to create virtual interfaces that map packets to
          or from specific MAC addresses to a particular interface.
@@ -138,7 +137,7 @@ config MACVLAN
          will be called macvlan.
 
 config MACVTAP
-       tristate "MAC-VLAN based tap driver (EXPERIMENTAL)"
+       tristate "MAC-VLAN based tap driver"
        depends on MACVLAN
        help
          This adds a specialized tap character device driver that is based
@@ -234,8 +233,8 @@ config VETH
          versa.
 
 config VIRTIO_NET
-       tristate "Virtio network driver (EXPERIMENTAL)"
-       depends on EXPERIMENTAL && VIRTIO
+       tristate "Virtio network driver"
+       depends on VIRTIO
        ---help---
          This is the virtual network driver for virtio.  It can be used with
          lguest or QEMU based VMMs (like KVM or Xen).  Say Y or M.
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to