Skip to content

Commit 904813c

Browse files
David Brownellgregkh
authored andcommitted
[PATCH] USB: usbnet (4/9) module for net1080 cables
As with the "cdc_subset" and "asix" drivers, this just moves the net1080 support into its one driver module. In this case there's a small bit of extra cleanup involved, moving some funky framing logic into the tx_fixup() routine (resolving a long overdue FIXME). Minor historical note: "usbnet" started out as "net1080", then got generalized to make it easier for other network drivers to reuse the urb queueing and fault management code here. Signed-off-by: David Brownell <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 2e55cc7 commit 904813c

File tree

4 files changed

+632
-580
lines changed

4 files changed

+632
-580
lines changed

drivers/usb/net/Kconfig

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -138,15 +138,6 @@ config USB_GENESYS
138138

139139
Note that the half-duplex "GL620USB" is not supported.
140140

141-
config USB_NET1080
142-
boolean "NetChip 1080 based cables (Laplink, ...)"
143-
default y
144-
depends on USB_USBNET
145-
help
146-
Choose this option if you're using a host-to-host cable based
147-
on this design: one NetChip 1080 chips and supporting logic,
148-
supporting LEDs that indicate traffic
149-
150141
config USB_PL2301
151142
boolean "Prolific PL-2301/2302 based cables"
152143
default y
@@ -233,6 +224,15 @@ config USB_NET_AX8817X
233224
what other networking devices you have in use.
234225

235226

227+
config USB_NET_NET1080
228+
tristate "NetChip 1080 based cables (Laplink, ...)"
229+
default y
230+
depends on USB_USBNET
231+
help
232+
Choose this option if you're using a host-to-host cable based
233+
on this design: one NetChip 1080 chip and supporting logic,
234+
optionally with LEDs that indicate traffic
235+
236236
config USB_NET_CDC_SUBSET
237237
tristate "Simple USB Network Links (CDC Ethernet subset)"
238238
depends on USB_USBNET

drivers/usb/net/Makefile

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

0 commit comments

Comments
 (0)