rndis_wext was renamed to rndis_wlan, fix, also lets

update compat.diff.

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

6 files changed, 57 insertions, 55 deletions

diff --git a/Makefile b/Makefile
index 6603ba6..8235315 100644
--- a/Makefile
+++ b/Makefile
@@ -100,7 +100,7 @@ install: uninstall modules
 	@modprobe -l rt61pci
 	@modprobe -l rt73usb
 	@modprobe -l rndis_host
-	@modprobe -l rndis_wext
+	@modprobe -l rndis_wlan
 	@modprobe -l rtl8180
 	@modprobe -l rtl8187
 	@# rc80211_simple is no longer a module
@@ -155,7 +155,7 @@ uninstall:
 	@modprobe -l rt61pci
 	@modprobe -l rt73usb
 	@modprobe -l rndis_host
-	@modprobe -l rndis_wext
+	@modprobe -l rndis_wlan
 	@modprobe -l rtl8180
 	@modprobe -l rtl8187
 	@# rc80211_simple is no longer a module
diff --git a/compat/compat.diff b/compat/compat.diff
index 65dd77a..1b614cd 100644
--- a/compat/compat.diff
+++ b/compat/compat.diff
@@ -280,28 +280,6 @@
  	event.o
  
  mac80211-$(CONFIG_MAC80211_LEDS) += ieee80211_led.o
---- a/net/mac80211/ieee80211.c	2008-01-26 19:37:05.000000000 -0500
-+++ b/net/mac80211/ieee80211.c	2008-01-26 19:37:05.000000000 -0500
-@@ -21,7 +21,9 @@
- #include <linux/wireless.h>
- #include <linux/rtnetlink.h>
- #include <linux/bitmap.h>
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24))
- #include <net/net_namespace.h>
-+#endif
- #include <net/cfg80211.h>
- 
- #include "ieee80211_i.h"
-@@ -1084,7 +1086,9 @@
- 	mdev->open = ieee80211_master_open;
- 	mdev->stop = ieee80211_master_stop;
- 	mdev->type = ARPHRD_IEEE80211;
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24))
- 	mdev->header_ops = &ieee80211_header_ops;
-+#endif
- 	mdev->set_multicast_list = ieee80211_master_set_multicast_list;
- 
- 	sdata->vif.type = IEEE80211_IF_TYPE_AP;
 --- a/drivers/net/wireless/adm8211.c	2008-01-26 19:37:05.000000000 -0500
 +++ b/drivers/net/wireless/adm8211.c	2008-01-26 19:37:05.000000000 -0500
 @@ -143,7 +143,11 @@
@@ -552,8 +530,54 @@
  
  	return 0;
  
---- a/drivers/net/wireless/Makefile	2008-01-26 19:37:05.000000000 -0500
-+++ b/drivers/net/wireless/Makefile	2008-01-26 19:45:21.000000000 -0500
+--- a/drivers/net/usb/Makefile	2008-01-28 11:00:13.000000000 -0500
++++ b/drivers/net/usb/Makefile	2008-01-28 11:00:31.000000000 -0500
+@@ -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/net/mac80211/ieee80211.c	2008-01-30 03:51:28.000000000 -0500
++++ b/net/mac80211/ieee80211.c	2008-01-30 03:51:28.000000000 -0500
+@@ -21,7 +21,9 @@
+ #include <linux/wireless.h>
+ #include <linux/rtnetlink.h>
+ #include <linux/bitmap.h>
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24))
+ #include <net/net_namespace.h>
++#endif
+ #include <net/cfg80211.h>
+ 
+ #include "ieee80211_i.h"
+@@ -1423,7 +1425,9 @@
+ 	mdev->open = ieee80211_master_open;
+ 	mdev->stop = ieee80211_master_stop;
+ 	mdev->type = ARPHRD_IEEE80211;
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24))
+ 	mdev->header_ops = &ieee80211_header_ops;
++#endif
+ 	mdev->set_multicast_list = ieee80211_master_set_multicast_list;
+ 
+ 	sdata->vif.type = IEEE80211_IF_TYPE_AP;
+--- a/drivers/net/wireless/Makefile	2008-01-30 03:51:28.000000000 -0500
++++ b/drivers/net/wireless/Makefile	2008-01-30 03:54:03.000000000 -0500
 @@ -6,49 +6,12 @@
  
  obj-$(CONFIG_IPW2200) += ipw2200.o
@@ -598,33 +622,9 @@
 -obj-$(CONFIG_PCMCIA_RAYCS)	+= ray_cs.o
 -obj-$(CONFIG_PCMCIA_WL3501)	+= wl3501_cs.o
 -
- obj-$(CONFIG_USB_NET_RNDIS_WEXT)	+= rndis_wext.o
+ obj-$(CONFIG_USB_NET_RNDIS_WLAN)	+= rndis_wlan.o
  
 -obj-$(CONFIG_USB_ZD1201)	+= zd1201.o
  obj-$(CONFIG_LIBERTAS)		+= libertas/
  
  rtl8180-objs		:= rtl8180_dev.o rtl8180_rtl8225.o rtl8180_sa2400.o rtl8180_max2820.o rtl8180_grf5101.o
---- a/drivers/net/usb/Makefile	2008-01-28 11:00:13.000000000 -0500
-+++ b/drivers/net/usb/Makefile	2008-01-28 11:00:31.000000000 -0500
-@@ -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
diff --git a/config.mk b/config.mk
index 2b6c7c4..622a0cc 100644
--- a/config.mk
+++ b/config.mk
@@ -49,7 +49,7 @@ CONFIG_EEPROM_93CX6=m
 # Note: this depends on CONFIG_USB_NET_RNDIS_HOST and CONFIG_USB_NET_CDCETHER
 # it also requires a new RNDIS_HOST module which we add
 CONFIG_USB_NET_RNDIS_HOST=m
-CONFIG_USB_NET_RNDIS_WEXT=m
+CONFIG_USB_NET_RNDIS_WLAN=m
 
 # Realtek
 CONFIG_RTL8180=m
diff --git a/scripts/admin-update.sh b/scripts/admin-update.sh
index 4d2d328..f8b9cba 100755
--- a/scripts/admin-update.sh
+++ b/scripts/admin-update.sh
@@ -70,7 +70,7 @@ DRIVER_FILES="$DRIVER_FILES p54pci.h p54pci.c"
 DRIVER_FILES="$DRIVER_FILES p54usb.h p54usb.c"
 DRIVER_FILES="$DRIVER_FILES ipw2100.h ipw2100.c"
 DRIVER_FILES="$DRIVER_FILES ipw2200.h ipw2200.c"
-DRIVER_FILES="$DRIVER_FILES rndis_wext.c"
+DRIVER_FILES="$DRIVER_FILES rndis_wlan.c"
 
 mkdir -p include/linux/ include/net/ include/linux/usb \
 	net/mac80211/ net/wireless/ net/ieee80211/ \
@@ -117,7 +117,7 @@ for i in $DRIVERS; do
 	rm -f $i/*.mod.c
 done
 
-# For rndis_wext, we need a new rndis_host
+# For rndis_wlan, we need a new rndis_host
 DIR="drivers/net/usb"
 echo "Copying $GIT_TREE/$DIR/rndis_host.c"
 cp $GIT_TREE/$DIR/rndis_host.c $DIR/
diff --git a/scripts/load.sh b/scripts/load.sh
index c38a1f4..1f2dfa0 100755
--- a/scripts/load.sh
+++ b/scripts/load.sh
@@ -9,6 +9,7 @@ MODULES="$MODULES rtl8180 rtl8187"
 MODULES="$MODULES rtl8180 rtl8187"
 MODULES="$MODULES rt2400pci rt2500pci rt61pci"
 MODULES="$MODULES rt2500usb rt73usb"
+MODULES="$MODULES rndis_wlan"
 for i in $MODULES; do
 	echo Loading $i...
 	modprobe $i
diff --git a/scripts/unload.sh b/scripts/unload.sh
index 2828223..8534909 100755
--- a/scripts/unload.sh
+++ b/scripts/unload.sh
@@ -2,7 +2,7 @@
 
 # The old stack drivers and the mac80211 rc80211_simple modules 
 # which is no longer on recent kernels (its internal)
-OLD_MODULES="rc80211_simple zd1211rw zd1211rw-mac80211 bcm43xx"
+OLD_MODULES="rc80211_simple zd1211rw zd1211rw-mac80211 bcm43xx rndis_wext"
 MODULES="$OLD_MODULES"
 MODULES="$MODULES ipw2100 ipw2200"
 MODULES="$MODULES libertas_cs usb8xxx libertas"
@@ -17,6 +17,7 @@ MODULES="$MODULES rt2400pci rt2500pci rt61pci"
 MODULES="$MODULES rt2500usb rt73usb"
 MODULES="$MODULES rt2x00usb rt2x00lib"
 MODULES="$MODULES rtl8180 rtl8187"
+MODULES="$MODULES rndis_wlan"
 # eeprom_93cx6 is used by rt2x00 (rt61pci, rt2500pci, rt2400pci) 
 # and Realtek drivers ( rtl8187, rtl8180)
 MODULES="$MODULES eeprom_93cx6"