Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / usb / net / Kconfig

diff --git a/drivers/usb/net/Kconfig b/drivers/usb/net/Kconfig
index b104430..efd6ca7 100644 (file)
--- a/drivers/usb/net/Kconfig
+++ b/drivers/usb/net/Kconfig
@@ -99,7 +99,7 @@ config USB_USBNET
          with "minidrivers" built around a common network driver core
          that supports deep queues for efficient transfers.  (This gives
          better performance with small packets and at high speeds).
          with "minidrivers" built around a common network driver core
          that supports deep queues for efficient transfers.  (This gives
          better performance with small packets and at high speeds).

-         
+

          The USB host runs "usbnet", and the other end of the link might be:
 
          - Another USB host, when using USB "network" or "data transfer"
          The USB host runs "usbnet", and the other end of the link might be:
 
          - Another USB host, when using USB "network" or "data transfer"


@@ -125,38 +125,63 @@ config USB_USBNET
          To compile this driver as a module, choose M here: the
          module will be called usbnet.
 
          To compile this driver as a module, choose M here: the
          module will be called usbnet.
 

-comment "USB Host-to-Host Cables"
-       depends on USB_USBNET
-
-config USB_ALI_M5632
-       boolean "ALi M5632 based 'USB 2.0 Data Link' cables"
-       depends on USB_USBNET
+config USB_NET_AX8817X
+       tristate "ASIX AX88xxx Based USB 2.0 Ethernet Adapters"
+       depends on USB_USBNET && NET_ETHERNET
+       select CRC32
+       select MII

        default y
        help
        default y
        help

-         Choose this option if you're using a host-to-host cable
-         based on this design, which supports USB 2.0 high speed.
+         This option adds support for ASIX AX88xxx based USB 2.0
+         10/100 Ethernet adapters.

 
 

-config USB_AN2720
-       boolean "AnchorChips 2720 based cables (Xircom PGUNET, ...)"
-       depends on USB_USBNET
-       default y
-       help
-         Choose this option if you're using a host-to-host cable
-         based on this design.  Note that AnchorChips is now a
-         Cypress brand.
+         This driver should work with at least the following devices:
+           * Aten UC210T
+           * ASIX AX88172
+           * Billionton Systems, USB2AR
+           * Buffalo LUA-U2-KTX
+           * Corega FEther USB2-TX
+           * D-Link DUB-E100
+           * Hawking UF200
+           * Linksys USB200M
+           * Netgear FA120
+           * Sitecom LN-029
+           * Intellinet USB 2.0 Ethernet
+           * ST Lab USB 2.0 Ethernet
+           * TrendNet TU2-ET100

 
 

-config USB_BELKIN
-       boolean "eTEK based host-to-host cables (Advance, Belkin, ...)"
+         This driver creates an interface named "ethX", where X depends on
+         what other networking devices you have in use.
+
+
+config USB_NET_CDCETHER
+       tristate "CDC Ethernet support (smart devices such as cable modems)"

        depends on USB_USBNET
        default y
        help
        depends on USB_USBNET
        default y
        help

-         Choose this option if you're using a host-to-host cable
-         based on this design:  two NetChip 2890 chips and an Atmel
-         microcontroller, with LEDs that indicate traffic.
+         This option supports devices conforming to the Communication Device
+         Class (CDC) Ethernet Control Model, a specification that's easy to
+         implement in device firmware.  The CDC specifications are available
+         from <http://www.usb.org/>.

 
 

-config USB_GENESYS
-       boolean "GeneSys GL620USB-A based cables"
-       default y
+         CDC Ethernet is an implementation option for DOCSIS cable modems
+         that support USB connectivity, used for non-Microsoft USB hosts.
+         The Linux-USB CDC Ethernet Gadget driver is an open implementation.
+         This driver should work with at least the following devices:
+
+           * Ericsson PipeRider (all variants)
+           * Motorola (DM100 and SB4100)
+           * Broadcom Cable Modem (reference design)
+           * Toshiba PCX1100U
+           * ...
+
+         This driver creates an interface named "ethX", where X depends on
+         what other networking devices you have in use.  However, if the
+         IEEE 802 "local assignment" bit is set in the address, a "usbX"
+         name is used instead.
+
+config USB_NET_GL620A
+       tristate "GeneSys GL620USB-A based cables"

        depends on USB_USBNET
        help
          Choose this option if you're using a host-to-host cable,
        depends on USB_USBNET
        help
          Choose this option if you're using a host-to-host cable,


@@ -164,38 +189,78 @@ config USB_GENESYS
 
          Note that the half-duplex "GL620USB" is not supported.
 
 
          Note that the half-duplex "GL620USB" is not supported.
 

-config USB_NET1080
-       boolean "NetChip 1080 based cables (Laplink, ...)"
+config USB_NET_NET1080
+       tristate "NetChip 1080 based cables (Laplink, ...)"

        default y
        depends on USB_USBNET
        help
          Choose this option if you're using a host-to-host cable based
        default y
        depends on USB_USBNET
        help
          Choose this option if you're using a host-to-host cable based

-         on this design:  one NetChip 1080 chips and supporting logic,
-         supporting LEDs that indicate traffic
+         on this design:  one NetChip 1080 chip and supporting logic,
+         optionally with LEDs that indicate traffic

 
 

-config USB_PL2301
-       boolean "Prolific PL-2301/2302 based cables"
-       default y
-       # handshake/init/reset problems, from original 'plusb' driver
+config USB_NET_PLUSB
+       tristate "Prolific PL-2301/2302 based cables"
+       # if the handshake/init/reset problems, from original 'plusb',
+       # are ever resolved ... then remove "experimental"

        depends on USB_USBNET && EXPERIMENTAL
        help
          Choose this option if you're using a host-to-host cable
          with one of these chips.
 
        depends on USB_USBNET && EXPERIMENTAL
        help
          Choose this option if you're using a host-to-host cable
          with one of these chips.
 

-config USB_KC2190
-       boolean "KT Technology KC2190 based cables (InstaNet)"
-       default y
+config USB_NET_RNDIS_HOST
+       tristate "Host for RNDIS devices (EXPERIMENTAL)"

        depends on USB_USBNET && EXPERIMENTAL
        depends on USB_USBNET && EXPERIMENTAL

+       select USB_NET_CDCETHER

        help
        help

-         Choose this option if you're using a host-to-host cable
-         with one of these chips.
+         This option enables hosting "Remote NDIS" USB networking links,
+         as encouraged by Microsoft (instead of CDC Ethernet!) for use in
+         various devices that may only support this protocol.

 
 

-comment "Intelligent USB Devices/Gadgets"
+         Avoid using this protocol unless you have no better options.
+         The protocol specification is incomplete, and is controlled by
+         (and for) Microsoft; it isn't an "Open" ecosystem or market.
+
+config USB_NET_CDC_SUBSET
+       tristate "Simple USB Network Links (CDC Ethernet subset)"

        depends on USB_USBNET
        depends on USB_USBNET

+       help
+         This driver module supports USB network devices that can work
+         without any device-specific information.  Select it if you have
+         one of these drivers.
+
+         Note that while many USB host-to-host cables can work in this mode,
+         that may mean not being able to talk to Win32 systems or more
+         commonly not being able to handle certain events (like replugging
+         the host on the other end) very well.  Also, these devices will
+         not generally have permanently assigned Ethernet addresses.
+
+config USB_ALI_M5632
+       boolean "ALi M5632 based 'USB 2.0 Data Link' cables"
+       depends on USB_NET_CDC_SUBSET
+       help
+         Choose this option if you're using a host-to-host cable
+         based on this design, which supports USB 2.0 high speed.
+
+config USB_AN2720
+       boolean "AnchorChips 2720 based cables (Xircom PGUNET, ...)"
+       depends on USB_NET_CDC_SUBSET
+       help
+         Choose this option if you're using a host-to-host cable
+         based on this design.  Note that AnchorChips is now a
+         Cypress brand.
+
+config USB_BELKIN
+       boolean "eTEK based host-to-host cables (Advance, Belkin, ...)"
+       depends on USB_NET_CDC_SUBSET
+       default y
+       help
+         Choose this option if you're using a host-to-host cable
+         based on this design:  two NetChip 2890 chips and an Atmel
+         microcontroller, with LEDs that indicate traffic.

 
 config USB_ARMLINUX
        boolean "Embedded ARM Linux links (iPaq, ...)"
 
 config USB_ARMLINUX
        boolean "Embedded ARM Linux links (iPaq, ...)"

-       depends on USB_USBNET
+       depends on USB_NET_CDC_SUBSET

        default y
        help
          Choose this option to support the "usb-eth" networking driver
        default y
        help
          Choose this option to support the "usb-eth" networking driver


@@ -212,15 +277,15 @@ config USB_ARMLINUX
 
 config USB_EPSON2888
        boolean "Epson 2888 based firmware (DEVELOPMENT)"
 
 config USB_EPSON2888
        boolean "Epson 2888 based firmware (DEVELOPMENT)"

-       depends on USB_USBNET
-       default y
+       depends on USB_NET_CDC_SUBSET

        help
          Choose this option to support the usb networking links used
          by some sample firmware from Epson.
 
        help
          Choose this option to support the usb networking links used
          by some sample firmware from Epson.
 

-config USB_ZAURUS
-       boolean "Sharp Zaurus (stock ROMs) and compatible"
+config USB_NET_ZAURUS
+       tristate "Sharp Zaurus (stock ROMs) and compatible"

        depends on USB_USBNET
        depends on USB_USBNET

+       select USB_NET_CDCETHER

        select CRC32
        default y
        help
        select CRC32
        default y
        help


@@ -229,67 +294,12 @@ config USB_ZAURUS
          This also supports some related device firmware, as used in some
          PDAs from Olympus and some cell phones from Motorola.
 
          This also supports some related device firmware, as used in some
          PDAs from Olympus and some cell phones from Motorola.
 

-         If you install an alternate ROM image, such as the Linux 2.6 based
+         If you install an alternate image, such as the Linux 2.6 based

          versions of OpenZaurus, you should no longer need to support this
          protocol.  Only the "eth-fd" or "net_fd" drivers in these devices
          really need this non-conformant variant of CDC Ethernet (or in
          some cases CDC MDLM) protocol, not "g_ether".
 
          versions of OpenZaurus, you should no longer need to support this
          protocol.  Only the "eth-fd" or "net_fd" drivers in these devices
          really need this non-conformant variant of CDC Ethernet (or in
          some cases CDC MDLM) protocol, not "g_ether".
 

-config USB_CDCETHER
-       boolean "CDC Ethernet support (smart devices such as cable modems)"
-       depends on USB_USBNET
-       default y
-       help
-         This option supports devices conforming to the Communication Device
-         Class (CDC) Ethernet Control Model, a specification that's easy to
-         implement in device firmware.  The CDC specifications are available
-         from <http://www.usb.org/>.
-         
-         CDC Ethernet is an implementation option for DOCSIS cable modems
-         that support USB connectivity, used for non-Microsoft USB hosts.
-         This driver should work with at least the following devices:
-
-           * Ericsson PipeRider (all variants)
-           * Motorola (DM100 and SB4100)
-           * Broadcom Cable Modem (reference design)
-           * Toshiba PCX1100U
-           * ...
-
-         This driver creates an interface named "ethX", where X depends on
-         what other networking devices you have in use.  However, if the
-         IEEE 802 "local assignment" bit is set in the address, a "usbX"
-         name is used instead.
-
-comment "USB Network Adapters"
-       depends on USB_USBNET
-
-config USB_AX8817X
-       boolean "ASIX AX88xxx Based USB 2.0 Ethernet Devices"
-       depends on USB_USBNET && NET_ETHERNET
-       select CRC32
-       select MII
-       default y
-       help
-         This option adds support for ASIX AX88xxx based USB 2.0
-         10/100 Ethernet devices.
-
-         This driver should work with at least the following devices:
-           * Aten UC210T
-           * ASIX AX88172
-           * Billionton Systems, USB2AR 
-           * Buffalo LUA-U2-KTX
-           * Corega FEther USB2-TX
-           * D-Link DUB-E100
-           * Hawking UF200
-           * Linksys USB200M
-           * Netgear FA120
-           * Sitecom LN-029
-           * Intellinet USB 2.0 Ethernet
-           * ST Lab USB 2.0 Ethernet
-           * TrendNet TU2-ET100
-
-         This driver creates an interface named "ethX", where X depends on
-         what other networking devices you have in use.  

 
 config USB_ZD1201
        tristate "USB ZD1201 based Wireless device support"
 
 config USB_ZD1201
        tristate "USB ZD1201 based Wireless device support"