Skip to contentSkip to conversation

move USB net drivers to drivers/net

PATCH In review Jeff Garzik 5 participants 5 messages May 10, 2007 – Aug 17, 2007

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

PATCH 1/1 move USB net drivers to drivers/net

This was ACK'd by Greg, as you see in the sign-offs. See the commit below for rationale.

USB is now treated like other buses, for network drivers:
* USB network driver patches should go to me and netdev
* Just like in PCI or PCMCIA land, bus-specific code may originate from the USB side of the house (Greg's tree).

Please pull from 'usb-move' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git usb-move

to receive the following update:

commit 5b2fc499917e5897a13add780e181b4cef197072

Author: Jeff Garzik <[email protected]>
Date:   Wed May 9 21:31:55 2007 -0400

Move USB network drivers to drivers/net/usb.

It is preferable to group drivers by usage (net, scsi, ATA, ...) than by bus. When reviewing drivers, the [PCI|USB|PCMCIA|...] maintainer is probably less qualified on networking issues than a networking maintainer. Also, from a practical standpoint, chips often appear on multiple buses, which is why we do not put drivers into drivers/pci/net.

 drivers/net/Kconfig                       |    2 ++
 drivers/net/Makefile                      |    8 ++++++++
 drivers/{usb/net => net/usb}/Kconfig      |    0 
 drivers/{usb/net => net/usb}/Makefile     |    0 
 drivers/{usb/net => net/usb}/asix.c       |    0 
 drivers/{usb/net => net/usb}/catc.c       |    0 
 drivers/{usb/net => net/usb}/cdc_ether.c  |    0 
 drivers/{usb/net => net/usb}/cdc_subset.c |    0 
 drivers/{usb/net => net/usb}/dm9601.c     |    0 
 drivers/{usb/net => net/usb}/gl620a.c     |    0 
 drivers/{usb/net => net/usb}/kaweth.c     |    0 
 drivers/{usb/net => net/usb}/kawethfw.h   |    0 
 drivers/{usb/net => net/usb}/mcs7830.c    |    0 
 drivers/{usb/net => net/usb}/net1080.c    |    0 
 drivers/{usb/net => net/usb}/pegasus.c    |    0 
 drivers/{usb/net => net/usb}/pegasus.h    |    0 
 drivers/{usb/net => net/usb}/plusb.c      |    0 
 drivers/{usb/net => net/usb}/rndis_host.c |    0 
 drivers/{usb/net => net/usb}/rtl8150.c    |    0 
 drivers/{usb/net => net/usb}/usbnet.c     |    0 
 drivers/{usb/net => net/usb}/usbnet.h     |    0 
 drivers/{usb/net => net/usb}/zaurus.c     |    0 
 drivers/usb/Kconfig                       |    2 --
 drivers/usb/Makefile                      |    7 -------
 24 files changed, 10 insertions(+), 9 deletions(-)
 rename drivers/{usb/net => net/usb}/Kconfig (100%)
 rename drivers/{usb/net => net/usb}/Makefile (100%)
 rename drivers/{usb/net => net/usb}/asix.c (100%)
 rename drivers/{usb/net => net/usb}/catc.c (100%)
 rename drivers/{usb/net => net/usb}/cdc_ether.c (100%)
 rename drivers/{usb/net => net/usb}/cdc_subset.c (100%)
 rename drivers/{usb/net => net/usb}/dm9601.c (100%)
 rename drivers/{usb/net => net/usb}/gl620a.c (100%)
 rename drivers/{usb/net => net/usb}/kaweth.c (100%)
 rename drivers/{usb/net => net/usb}/kawethfw.h (100%)
 rename drivers/{usb/net => net/usb}/mcs7830.c (100%)
 rename drivers/{usb/net => net/usb}/net1080.c (100%)
 rename drivers/{usb/net => net/usb}/pegasus.c (100%)
 rename drivers/{usb/net => net/usb}/pegasus.h (100%)
 rename drivers/{usb/net => net/usb}/plusb.c (100%)
 rename drivers/{usb/net => net/usb}/rndis_host.c (100%)
 rename drivers/{usb/net => net/usb}/rtl8150.c (100%)
 rename drivers/{usb/net => net/usb}/usbnet.c (100%)
 rename drivers/{usb/net => net/usb}/usbnet.h (100%)
 rename drivers/{usb/net => net/usb}/zaurus.c (100%)
drivers/net/Kconfig +2 -0
index b86ccd2..d9842d8 100644
@@ -2499,6 +2499,8 @@ source "drivers/net/tokenring/Kconfig"
 
 source "drivers/net/wireless/Kconfig"
 
+source "drivers/net/usb/Kconfig"
+
 source "drivers/net/pcmcia/Kconfig"
 
 source "drivers/net/wan/Kconfig"
drivers/net/Makefile +8 -0
index 59c0459..c5d8423 100644
@@ -206,6 +206,14 @@ obj-$(CONFIG_TR) += tokenring/
 obj-$(CONFIG_WAN) += wan/
 obj-$(CONFIG_ARCNET) += arcnet/
 obj-$(CONFIG_NET_PCMCIA) += pcmcia/
+
+obj-$(CONFIG_USB_CATC)          += usb/
+obj-$(CONFIG_USB_KAWETH)        += usb/
+obj-$(CONFIG_USB_PEGASUS)       += usb/
+obj-$(CONFIG_USB_RTL8150)       += usb/
+obj-$(CONFIG_USB_USBNET)        += usb/
+obj-$(CONFIG_USB_ZD1201)        += usb/
+
 obj-y += wireless/
 obj-$(CONFIG_NET_TULIP) += tulip/
 obj-$(CONFIG_HAMRADIO) += hamradio/

[SNIP ADD PATCHES AS OBVIOUS]

drivers/usb/Kconfig +0 -2
index b847bbc..278a22c 100644
@@ -87,8 +87,6 @@ source "drivers/usb/storage/Kconfig"
 
 source "drivers/usb/image/Kconfig"
 
-source "drivers/usb/net/Kconfig"
-
 source "drivers/usb/mon/Kconfig"
 
 comment "USB port drivers"
drivers/usb/Makefile +0 -7
index 0ef090b..72464b5 100644
@@ -23,13 +23,6 @@ obj-$(CONFIG_USB_PRINTER)	+= class/
 obj-$(CONFIG_USB_STORAGE)	+= storage/
 obj-$(CONFIG_USB)		+= storage/
 
-obj-$(CONFIG_USB_CATC)		+= net/
-obj-$(CONFIG_USB_KAWETH)	+= net/
-obj-$(CONFIG_USB_PEGASUS)	+= net/
-obj-$(CONFIG_USB_RTL8150)	+= net/
-obj-$(CONFIG_USB_USBNET)	+= net/
-obj-$(CONFIG_USB_ZD1201)	+= net/
-
 obj-$(CONFIG_USB_MDC800)	+= image/
 obj-$(CONFIG_USB_MICROTEK)	+= image/
 

[SNIP REMOVE PATCHES AS OBVIOUS]

#1 lore raw

Hello,

Quoted 21 lines · Jeff Garzik

This was ACK'd by Greg, as you see in the sign-offs. See the commit below for rationale.

USB is now treated like other buses, for network drivers:
* USB network driver patches should go to me and netdev
* Just like in PCI or PCMCIA land, bus-specific code may originate from the USB side of the house (Greg's tree).

Please pull from 'usb-move' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git usb-move

to receive the following update:

commit 5b2fc499917e5897a13add780e181b4cef197072

Author: Jeff Garzik <[email protected]>
Date:   Wed May 9 21:31:55 2007 -0400
Quoted 8 lines

Move USB network drivers to drivers/net/usb.

It is preferable to group drivers by usage (net, scsi, ATA, ...) than by bus. When reviewing drivers, the [PCI|USB|PCMCIA|...] maintainer is probably less qualified on networking issues than a networking maintainer. Also, from a practical standpoint, chips often appear on multiple buses, which is why we do not put drivers into drivers/pci/net.

What about drivers/usb/atm/?

Greetings,

Indan

#2 lore raw
Quoted 26 lines · On Thursday 10 May 2007 14:12:47 Indan Zupancic wrote:

Hello,

Quoted 23 lines · Jeff Garzik

This was ACK'd by Greg, as you see in the sign-offs. See the commit below for rationale.

USB is now treated like other buses, for network drivers:
* USB network driver patches should go to me and netdev
* Just like in PCI or PCMCIA land, bus-specific code may originate from the USB side of the house (Greg's tree).

Please pull from 'usb-move' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git usb-move

to receive the following update:

commit 5b2fc499917e5897a13add780e181b4cef197072

Author: Jeff Garzik <[email protected]>
Date:   Wed May 9 21:31:55 2007 -0400

Move USB network drivers to drivers/net/usb.

Quoted 8 lines
Quoted 6 lines

It is preferable to group drivers by usage (net, scsi, ATA, ...) than by bus. When reviewing drivers, the [PCI|USB|PCMCIA|...] maintainer is probably less qualified on networking issues than a networking maintainer. Also, from a practical standpoint, chips often appear on multiple buses, which is why we do not put drivers into drivers/pci/net.

What about drivers/usb/atm/?

I don't mind if it moves to drivers/atm/, though I don't see the point of it.

Best wishes,

Duncan.

#3 lore raw
In reply to Jeff Garzik

Hi Jeff,

Quoted 8 lines · Jeff Garzik
drivers/net/Makefile +0 -0
index 59c0459..c5d8423 100644
@@ -206,6 +206,14 @@ obj-$(CONFIG_TR) += tokenring/

obj-$(CONFIG_WAN) += wan/
obj-$(CONFIG_ARCNET) += arcnet/
obj-$(CONFIG_NET_PCMCIA) += pcmcia/

drivers/net/Makefile

Quoted 8 lines
drivers/net/Makefile +8 -0
+
+obj-$(CONFIG_USB_CATC)          += usb/
+obj-$(CONFIG_USB_KAWETH)        += usb/
+obj-$(CONFIG_USB_PEGASUS)       += usb/
+obj-$(CONFIG_USB_RTL8150)       += usb/
+obj-$(CONFIG_USB_USBNET)        += usb/
+obj-$(CONFIG_USB_ZD1201)        += usb/
+

This looks, well, a bit ugly. Since we seem to be going in the direction of using "menuconfig"s (Kconfig language object) anyway, I propose the patch below.

drivers/net/usb/Kconfig new file +5 -0
new file mode 100644
index 0000000..3de564b
@@ -0,0 +1,338 @@
+#
+# USB Network devices configuration
+#
+comment "Networking support is needed for USB Network Adapter support"
+       depends on USB && !NET

This comment is superfluous. If !NET, then NETDEVICES is not even available. Since you just moved/renamed it, you are not to blame. Though, I remove it in below's patch (applies on top of
commit 5b2fc499917e5897a13add780e181b4cef197072).

drivers/net/Makefile +1 -6
index c5d8423..5f6112d 100644
@@ -207,12 +207,7 @@ obj-$(CONFIG_WAN) += wan/
 obj-$(CONFIG_ARCNET) += arcnet/
 obj-$(CONFIG_NET_PCMCIA) += pcmcia/
 
-obj-$(CONFIG_USB_CATC)          += usb/
-obj-$(CONFIG_USB_KAWETH)        += usb/
-obj-$(CONFIG_USB_PEGASUS)       += usb/
-obj-$(CONFIG_USB_RTL8150)       += usb/
-obj-$(CONFIG_USB_USBNET)        += usb/
-obj-$(CONFIG_USB_ZD1201)        += usb/
+obj-$(CONFIG_NETDEV_USB) += usb/
 
 obj-y += wireless/
 obj-$(CONFIG_NET_TULIP) += tulip/
drivers/net/usb/Kconfig +6 -6
index 3de564b..2458f99 100644
@@ -1,11 +1,12 @@
 #
 # USB Network devices configuration
 #
-comment "Networking support is needed for USB Network Adapter support"
-	depends on USB && !NET
-
-menu "USB Network Adapters"
+menuconfig NETDEVICES_USB
+	bool "USB Network Adapters"
 	depends on USB && NET
+	default y
+
+if NETDEVICES_USB
 
 config USB_CATC
 	tristate "USB CATC NetMate-based Ethernet device support (EXPERIMENTAL)"
@@ -334,5 +335,4 @@ config USB_NET_ZAURUS
 	  really need this non-conformant variant of CDC Ethernet (or in
 	  some cases CDC MDLM) protocol, not "g_ether".
 
-
-endmenu
+endif # NETDEVICES_USB

#<EOF>

Jan

#4 lore raw

Hi,

Quoted 18 lines · Jan Engelhardt

Subject: Re: [another git patch] move USB net drivers to drivers/net

Hi Jeff,

Quoted 12 lines · Jeff Garzik
drivers/net/Makefile +0 -0
index 59c0459..c5d8423 100644
@@ -206,6 +206,14 @@ obj-$(CONFIG_TR) += tokenring/

obj-$(CONFIG_WAN) += wan/
obj-$(CONFIG_ARCNET) += arcnet/
obj-$(CONFIG_NET_PCMCIA) += pcmcia/

drivers/net/Makefile +4 -0
+
+obj-$(CONFIG_USB_CATC)          += usb/
+obj-$(CONFIG_USB_KAWETH)        += usb/
+obj-$(CONFIG_USB_PEGASUS)       += usb/
Quoted 8 lines

drivers/net/Makefile

Quoted 4 lines
drivers/net/Makefile +4 -0
+obj-$(CONFIG_USB_RTL8150)       += usb/
+obj-$(CONFIG_USB_USBNET)        += usb/
+obj-$(CONFIG_USB_ZD1201)        += usb/
+

This looks, well, a bit ugly. Since we seem to be going in the direction of using "menuconfig"s (Kconfig language object) anyway, I propose the patch below.

Please consider, thank you.

Quoted 69 lines
drivers/net/usb/Kconfig new file +5 -0
new file mode 100644
index 0000000..3de564b
@@ -0,0 +1,338 @@
+#
+# USB Network devices configuration
+#
+comment "Networking support is needed for USB Network Adapter support"
+       depends on USB && !NET

This comment is superfluous. If !NET, then NETDEVICES is not even available. Since you just moved/renamed it, you are not to blame. Though, I remove it in below's patch (applies on top of
commit 5b2fc499917e5897a13add780e181b4cef197072).

drivers/net/Makefile +0 -0
index c5d8423..5f6112d 100644
@@ -207,12 +207,7 @@ obj-$(CONFIG_WAN) += wan/

obj-$(CONFIG_ARCNET) += arcnet/
obj-$(CONFIG_NET_PCMCIA) += pcmcia/

drivers/net/Makefile +1 -6
-obj-$(CONFIG_USB_CATC)          += usb/
-obj-$(CONFIG_USB_KAWETH)        += usb/
-obj-$(CONFIG_USB_PEGASUS)       += usb/
-obj-$(CONFIG_USB_RTL8150)       += usb/
-obj-$(CONFIG_USB_USBNET)        += usb/
-obj-$(CONFIG_USB_ZD1201)        += usb/
+obj-$(CONFIG_NETDEV_USB) += usb/

obj-y += wireless/
obj-$(CONFIG_NET_TULIP) += tulip/

drivers/net/usb/Kconfig +5 -4
index 3de564b..2458f99 100644
@@ -1,11 +1,12 @@
 #
 # USB Network devices configuration
 #
-comment "Networking support is needed for USB Network Adapter support"
-	depends on USB && !NET
-
-menu "USB Network Adapters"
+menuconfig NETDEVICES_USB
+	bool "USB Network Adapters"
 	depends on USB && NET
+	default y
+
+if NETDEVICES_USB
 

config USB_CATC
tristate "USB CATC NetMate-based Ethernet device support (EXPERIMENTAL)"

drivers/net/usb/Kconfig +1 -2
@@ -334,5 +335,4 @@ config USB_NET_ZAURUS
 	  really need this non-conformant variant of CDC Ethernet (or in
 	  some cases CDC MDLM) protocol, not "g_ether".
 
-
-endmenu
+endif # NETDEVICES_USB

#<EOF>

Quoted 2 lines

Jan

Jan