Add usbnet.ko for rndis_wlan. Note that if you have other usbnet

driver this may break them. We may eventually just add the other
usbnet drivers here as its a small list.

Signed-off-by: Luis R. Rodriguez <mcgrof@winlab.rutgers.edu>

4 files changed, 28 insertions, 27 deletions

diff --git a/Makefile b/Makefile
index 98b40ee..522b07f 100644
--- a/Makefile
+++ b/Makefile
@@ -102,6 +102,7 @@ install: uninstall modules
 	@$(MODPROBE) -l rt2500usb
 	@$(MODPROBE) -l rt61pci
 	@$(MODPROBE) -l rt73usb
+	@$(MODPROBE) -l usbnet
 	@$(MODPROBE) -l cdc_ether
 	@$(MODPROBE) -l rndis_host
 	@$(MODPROBE) -l rndis_wlan
@@ -159,6 +160,7 @@ uninstall:
 	@$(MODPROBE) -l rt2500usb
 	@$(MODPROBE) -l rt61pci
 	@$(MODPROBE) -l rt73usb
+	@$(MODPROBE) -l usbnet
 	@$(MODPROBE) -l cdc_ether
 	@$(MODPROBE) -l rndis_host
 	@$(MODPROBE) -l rndis_wlan
diff --git a/compat/compat.diff b/compat/compat.diff
index 82ebcf0..cce9875 100644
--- a/compat/compat.diff
+++ b/compat/compat.diff
@@ -145,30 +145,6 @@
 -cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o
 +cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o compat.o
  cfg80211-$(CONFIG_NL80211) += nl80211.o
---- a/drivers/net/usb/Makefile	2008-02-28 19:54:52.000000000 +0100
-+++ b/drivers/net/usb/Makefile	2008-02-28 19:54:53.000000000 +0100
-@@ -2,21 +2,7 @@
- # Makefile for USB Network drivers
- #
- 
--obj-$(CONFIG_USB_CATC)		+= catc.o
--obj-$(CONFIG_USB_KAWETH)	+= kaweth.o
--obj-$(CONFIG_USB_PEGASUS)	+= pegasus.o
--obj-$(CONFIG_USB_RTL8150)	+= rtl8150.o
--obj-$(CONFIG_USB_NET_AX8817X)	+= asix.o
--obj-$(CONFIG_USB_NET_CDCETHER)	+= cdc_ether.o
--obj-$(CONFIG_USB_NET_DM9601)	+= dm9601.o
--obj-$(CONFIG_USB_NET_GL620A)	+= gl620a.o
--obj-$(CONFIG_USB_NET_NET1080)	+= net1080.o
--obj-$(CONFIG_USB_NET_PLUSB)	+= plusb.o
- obj-$(CONFIG_USB_NET_RNDIS_HOST)	+= rndis_host.o
--obj-$(CONFIG_USB_NET_CDC_SUBSET)	+= cdc_subset.o
--obj-$(CONFIG_USB_NET_ZAURUS)	+= zaurus.o
--obj-$(CONFIG_USB_NET_MCS7830)	+= mcs7830.o
--obj-$(CONFIG_USB_USBNET)	+= usbnet.o
- 
- ifeq ($(CONFIG_USB_DEBUG),y)
- EXTRA_CFLAGS += -DDEBUG
 --- a/drivers/net/wireless/Makefile	2008-03-11 19:54:52.000000000 +0100
 +++ b/drivers/net/wireless/Makefile	2008-03-11 19:54:53.000000000 +0100
 @@ -6,48 +6,13 @@ obj-$(CONFIG_IPW2100) += ipw2100.o
@@ -884,3 +860,26 @@
  	if (ah->ah_version != AR5K_AR5210) {
  		AR5K_REG_WRITE_BITS(ah, AR5K_TXCFG,
  			AR5K_TXCFG_SDMAMR, dma_size);
+--- a/drivers/net/usb/Makefile	2008-04-27 03:18:48.000000000 -0700
++++ b/drivers/net/usb/Makefile	2008-04-27 03:12:39.000000000 -0700
+@@ -2,20 +2,8 @@
+ # Makefile for USB Network drivers
+ #
+ 
+-obj-$(CONFIG_USB_CATC)		+= catc.o
+-obj-$(CONFIG_USB_KAWETH)	+= kaweth.o
+-obj-$(CONFIG_USB_PEGASUS)	+= pegasus.o
+-obj-$(CONFIG_USB_RTL8150)	+= rtl8150.o
+-obj-$(CONFIG_USB_NET_AX8817X)	+= asix.o
+ obj-$(CONFIG_USB_NET_CDCETHER)	+= cdc_ether.o
+-obj-$(CONFIG_USB_NET_DM9601)	+= dm9601.o
+-obj-$(CONFIG_USB_NET_GL620A)	+= gl620a.o
+-obj-$(CONFIG_USB_NET_NET1080)	+= net1080.o
+-obj-$(CONFIG_USB_NET_PLUSB)	+= plusb.o
+ obj-$(CONFIG_USB_NET_RNDIS_HOST)	+= rndis_host.o
+-obj-$(CONFIG_USB_NET_CDC_SUBSET)	+= cdc_subset.o
+-obj-$(CONFIG_USB_NET_ZAURUS)	+= zaurus.o
+-obj-$(CONFIG_USB_NET_MCS7830)	+= mcs7830.o
+ obj-$(CONFIG_USB_USBNET)	+= usbnet.o
+ 
+ ifeq ($(CONFIG_USB_DEBUG),y)
diff --git a/scripts/admin-update.sh b/scripts/admin-update.sh
index dc6ba70..555c1e8 100755
--- a/scripts/admin-update.sh
+++ b/scripts/admin-update.sh
@@ -117,8 +117,8 @@ for i in $DRIVERS; do
 	rm -f $i/*.mod.c
 done
 
-# For rndis_wlan, we need a new rndis_host and cdc_ether
-RNDIS_REQS="Makefile rndis_host.c cdc_ether.c"
+# For rndis_wlan, we need a new rndis_host.ko, cdc_ether.ko and usbnet.ko
+RNDIS_REQS="Makefile rndis_host.c cdc_ether.c usbnet.c"
 DIR="drivers/net/usb"
 for i in $RNDIS_REQS; do
 	echo "Copying $GIT_TREE/$DIR/$i"
diff --git a/scripts/unload.sh b/scripts/unload.sh
index b156107..0090fd1 100755
--- a/scripts/unload.sh
+++ b/scripts/unload.sh
@@ -18,7 +18,7 @@ MODULES="$MODULES rt2500usb rt73usb"
 MODULES="$MODULES rt2x00usb rt2x00lib"
 MODULES="$MODULES rtl8180 rtl8187"
 MODULES="$MODULES at76_usb"
-MODULES="$MODULES rndis_wlan rndis_host cdc_ether"
+MODULES="$MODULES rndis_wlan rndis_host cdc_ether usbnet"
 # eeprom_93cx6 is used by rt2x00 (rt61pci, rt2500pci, rt2400pci) 
 # and Realtek drivers ( rtl8187, rtl8180)
 MODULES="$MODULES eeprom_93cx6"