drivers/net/3c505: Convert to generic boolean

[linux-2.6] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index c5519250efd978235a9a4ba73ed1f80f641978cf..734f8403c806cd0fcf5a22757991d2b26fbebdfb 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -135,6 +135,12 @@ config TUN
 
          If you don't know what to use this for, you don't need it.
 
+config VETH
+       tristate "Virtual ethernet device"
+       ---help---
+         The device is an ethernet tunnel. Devices are created in pairs. When
+         one end receives the packet it appears on its pair and vice versa.
+
 config NET_SB1000
        tristate "General Instruments Surfboard 1000"
        depends on PNP
@@ -480,26 +486,6 @@ config SGI_IOC3_ETH
          the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 
-config SGI_IOC3_ETH_HW_RX_CSUM
-       bool "Receive hardware checksums"
-       depends on SGI_IOC3_ETH && INET
-       default y
-       help
-         The SGI IOC3 network adapter supports TCP and UDP checksums in
-         hardware to offload processing of these checksums from the CPU.  At
-         the moment only acceleration of IPv4 is supported.  This option
-         enables offloading for checksums on receive.  If unsure, say Y.
-
-config SGI_IOC3_ETH_HW_TX_CSUM
-       bool "Transmit hardware checksums"
-       depends on SGI_IOC3_ETH && INET
-       default y
-       help
-         The SGI IOC3 network adapter supports TCP and UDP checksums in
-         hardware to offload processing of these checksums from the CPU.  At
-         the moment only acceleration of IPv4 is supported.  This option
-         enables offloading for checksums on transmit.  If unsure, say Y.
-
 config MIPS_SIM_NET
        tristate "MIPS simulator Network device"
        depends on MIPS_SIM
@@ -2501,6 +2487,7 @@ config CHELSIO_T3
 config EHEA
        tristate "eHEA Ethernet support"
        depends on IBMEBUS
+       select INET_LRO
        ---help---
          This driver supports the IBM pSeries eHEA ethernet adapter.
 
@@ -2576,6 +2563,7 @@ config MYRI10GE
        depends on PCI
        select FW_LOADER
        select CRC32
+       select INET_LRO
        ---help---
          This driver supports Myricom Myri-10G Dual Protocol interface in
          Ethernet mode. If the eeprom on your board is not recent enough,
@@ -3074,6 +3062,16 @@ config NETCONSOLE
        If you want to log kernel messages over the network, enable this.
        See <file:Documentation/networking/netconsole.txt> for details.
 
+config NETCONSOLE_DYNAMIC
+       bool "Dynamic reconfiguration of logging targets (EXPERIMENTAL)"
+       depends on NETCONSOLE && SYSFS && EXPERIMENTAL
+       select CONFIGFS_FS
+       help
+         This option enables the ability to dynamically reconfigure target
+         parameters (interface, IP addresses, port numbers, MAC addresses)
+         at runtime through a userspace interface exported using configfs.
+         See <file:Documentation/networking/netconsole.txt> for details.
+
 config NETPOLL
        def_bool NETCONSOLE