Skip to contentSkip to conversation

update usbnet matching 2.6.recent

patch/RFT 2.4.26-rc2 David Brownell 1 participant 1 message Apr 12, 2004

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Title says it all; the 2.4 "usbnet" is missing features and fixes, this patch makes the delta from 2.6 be pretty small.

Its Config.in menu now looks more like 2.6, with per-minidriver config options. This matters mostly since the AX8817X driver will no longer be hidden (it's good for getting good 100BaseT speeds using EHCI).

On 2.6, "usbnet" handles CDC Ethernet ... so this patch disables "CDCEther", which may exceed some folk's expectations of what should happen in a "stable" kernel. However: (a) it's what Zaurus users have needed to do anyway (Zaurus claims CDC support, but lies),
(b) this seems to work well on 2.6 systems, better on some hardware than "CDCEther", and (c) the CDCEther maintainer (GregKH) seemed to think making "usbnet" do this was OK last time this came up.

If you use "usbnet" or especially "CDCEther", and have the time to apply, please give this a whirl ... I don't think there should be many issues, there's not a lot of 2.4-specific code here.

- Dave

The "usbnet" driver has gotten a bit out of sync with the newer code (2.6.5+); this fixes that. Notable changes:

- Support more devices: Zaurus C-860, ALi M5632, and the new Linux-USB Ethernet/RNDIS gadget.

- Supports CDC Ethernet. 2.6 doesn't use CDCEther, and this probably supports some hardware that CDCEther won't.

- The kernel config setup changed to match 2.6. If in doubt, "y" for all the new options. Among other things, this means that the ax8817x support is no longer invisible!

- Disables the old "CDCEther.c" driver in Config.in; probably not the ideal solution, but it'll simplify testing.

- Various chip-specific updates/fixes: net1080 flushes fifos to recover after framing errors; ax8817x gets lots of ethtool support, including WOL, MII, and EEPROM access.

- Cleanups, including using alloc_etherdev and ethtool_ops. Throttle down resubmit during temporary faults (and unplug).

Documentation/Configure.help +28 -17
@@ -15847,24 +15847,35 @@
   The module will be called dabusb.o.  If you want to compile it as a
   module, say M here and read <file:Documentation/modules.txt>.
 
-Host-to-Host USB networking
+Multi-purpose USB Networking Framework
 CONFIG_USB_USBNET
-  This driver supports network links over USB with USB "Network"
-  or "data transfer" cables, often used to network laptops to PCs.
-  Such cables have chips from suppliers such as Belkin/eTEK, GeneSys
-  (GeneLink), NetChip and Prolific. Intelligent USB devices could also
-  use this approach to provide Internet access, using standard USB
-  cabling. You can find these chips also on some motherboards with
-  USB PC2PC support.
-
-  These links will have names like "usb0", "usb1", etc.  They act
-  like two-node Ethernets, so you can use 802.1d Ethernet Bridging
-  (CONFIG_BRIDGE) to simplify your network routing.
-
-  This code is also available as a kernel module (code which can be
-  inserted in and removed from the running kernel whenever you want).
-  The module will be called usbnet.o. If you want to compile it as a
-  module, say M here and read <file:Documentation/modules.txt>.
+  This driver supports several kinds of network links over USB,
+  with "minidrivers" built around a common network driver core.
+  
+  The USB host runs "usbnet", and the other end of the link might be:
+
+  - Another USB host, when using USB "network" or "data transfer"
+    cables.  These are often used to network laptops to PCs, like
+    "Laplink" parallel cables or some motherboards.  These rely
+    on specialized chips from many suppliers.
+
+  - An intelligent USB gadget, perhaps embedding a Linux system.
+    These include PDAs running Linux (iPaq, Yopy, Zaurus, and
+    others), and devices that interoperate using the standard
+    CDC-Ethernet specification (including many cable modems).
+
+  - Network adapter hardware (like those for 10/100 Ethernet) which
+    uses this driver framework.
+
+  The link will appear with a name like "usb0", when the link is
+  a two-node link, or "eth0" for most Ethernet devices.  Those
+  two-node links are most easily managed with Ethernet Bridging
+  (CONFIG_BRIDGE) instead of routing.
+
+  For more information see <http://www.linux-usb.org/usbnet/>.
+
+  To compile this driver as a module, choose M here: the
+  module will be called usbnet.
 
 Freecom USB/ATAPI Bridge support
 CONFIG_USB_STORAGE_FREECOM
drivers/usb/Config.in +18 -2
@@ -92,8 +92,24 @@
       dep_tristate '  USB Realtek RTL8150 based ethernet device support (EXPERIMENTAL)' CONFIG_USB_RTL8150 $CONFIG_USB $CONFIG_NET $CONFIG_EXPERIMENTAL
       dep_tristate '  USB KLSI KL5USB101-based ethernet device support (EXPERIMENTAL)' CONFIG_USB_KAWETH $CONFIG_USB $CONFIG_NET $CONFIG_EXPERIMENTAL
       dep_tristate '  USB CATC NetMate-based Ethernet device support (EXPERIMENTAL)' CONFIG_USB_CATC $CONFIG_USB $CONFIG_NET $CONFIG_EXPERIMENTAL
-      dep_tristate '  USB Communication Class Ethernet device support (EXPERIMENTAL)' CONFIG_USB_CDCETHER $CONFIG_USB $CONFIG_NET $CONFIG_EXPERIMENTAL
-      dep_tristate '  USB-to-USB Networking cables, Linux PDAs, ... (EXPERIMENTAL)' CONFIG_USB_USBNET $CONFIG_USB $CONFIG_NET $CONFIG_EXPERIMENTAL
+      # dep_tristate '  USB Communication Class Ethernet device support (EXPERIMENTAL)' CONFIG_USB_CDCETHER $CONFIG_USB $CONFIG_NET $CONFIG_EXPERIMENTAL
+      dep_tristate '  Multi-purpose USB Networking Framework (EXPERIMENTAL)' CONFIG_USB_USBNET $CONFIG_USB $CONFIG_NET $CONFIG_EXPERIMENTAL
+      if [ "$CONFIG_USB_USBNET" = "y" -o "$CONFIG_USB_USBNET" = "m" ]; then
+	comment '   Host-to-Host cables'
+	bool    '    ALi M5632 USB 2.0' CONFIG_USB_ALI_5632
+	bool    '    AnchorChips 2720' CONFIG_USB_AN2720
+	bool    '    Belkin/ETek' CONFIG_USB_BELKIN
+	bool    '    GeneSys GL620USB-A' CONFIG_USB_GENESYS
+	bool    '    NetChip 1080' CONFIG_USB_NET1080
+	bool    '    Prolific PL-2301/2302' CONFIG_USB_PL2301
+	comment '   Embedded firmware'
+	bool    '    ARM (and other) embedded Linux' CONFIG_USB_ARMLINUX
+	bool    '    CDC Ethernet' CONFIG_USB_CDCETHER
+	bool    '    EPSON sample firmware' CONFIG_USB_EPSON2888
+	bool    '    Sharp Zaurus (many models)' CONFIG_USB_ZAURUS
+	comment '   Ethernet Adapters'
+	bool    '    ASIX AX8817X based USB 2.0' CONFIG_USB_AX8817X
+     fi
    fi
 
    comment 'USB port drivers'
drivers/usb/usbnet.c +1155 -416

2,498 lines not on this page · raw message