Skip to content

Commit 2e55cc7

Browse files
David Brownellgregkh
authored andcommitted
[PATCH] USB: usbnet (3/9) module for ASIX Ethernet adapters
This patch moves the ASIX AX8817x driver into its own file, just using the "usbnet" infrastructure as a utility library. - As with "cdc_subset" this involved minor Kconfig/kbuild tweaks, moving code from one file to another, and exporting a few functions. - This includes updates from Jamie Painter to add (and use) a new hook to handle the different maximum transfer sizes for rx and tx sides. - Also from Jamie, some bugfixes: * MDIO byteorder (to address some PPC media negotiation problems); * Force alignment at key spots when using ax88772 framing (on some embedded hardware, the network stack will break otherwise); * Address some link reset problems. It also makes this driver use the standard (5 seconds vs half second) control timeouts used elsewhere in USB; and wraps a few lines before the 80th column (which previously needed it). Signed-off-by: David Brownell <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 38bde1d commit 2e55cc7

File tree

5 files changed

+1010
-896
lines changed

5 files changed

+1010
-896
lines changed

drivers/usb/net/Kconfig

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -202,23 +202,22 @@ config USB_CDCETHER
202202
IEEE 802 "local assignment" bit is set in the address, a "usbX"
203203
name is used instead.
204204

205-
comment "USB Network Adapters"
206-
depends on USB_USBNET
205+
comment "Drivers built using the usbnet core"
207206

208-
config USB_AX8817X
209-
boolean "ASIX AX88xxx Based USB 2.0 Ethernet Devices"
207+
config USB_NET_AX8817X
208+
tristate "ASIX AX88xxx Based USB 2.0 Ethernet Adapters"
210209
depends on USB_USBNET && NET_ETHERNET
211210
select CRC32
212211
select MII
213212
default y
214213
help
215214
This option adds support for ASIX AX88xxx based USB 2.0
216-
10/100 Ethernet devices.
215+
10/100 Ethernet adapters.
217216

218217
This driver should work with at least the following devices:
219218
* Aten UC210T
220219
* ASIX AX88172
221-
* Billionton Systems, USB2AR
220+
* Billionton Systems, USB2AR
222221
* Buffalo LUA-U2-KTX
223222
* Corega FEther USB2-TX
224223
* D-Link DUB-E100
@@ -231,7 +230,7 @@ config USB_AX8817X
231230
* TrendNet TU2-ET100
232231

233232
This driver creates an interface named "ethX", where X depends on
234-
what other networking devices you have in use.
233+
what other networking devices you have in use.
235234

236235

237236
config USB_NET_CDC_SUBSET

drivers/usb/net/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ obj-$(CONFIG_USB_CATC) += catc.o
66
obj-$(CONFIG_USB_KAWETH) += kaweth.o
77
obj-$(CONFIG_USB_PEGASUS) += pegasus.o
88
obj-$(CONFIG_USB_RTL8150) += rtl8150.o
9+
obj-$(CONFIG_USB_NET_AX8817X) += asix.o
910
obj-$(CONFIG_USB_NET_CDC_SUBSET) += cdc_subset.o
1011
obj-$(CONFIG_USB_USBNET) += usbnet.o
1112
obj-$(CONFIG_USB_ZD1201) += zd1201.o

0 commit comments

Comments
 (0)