* Update compat.diff to reflect v2.6.24-rc1-2799-gb8b5f6a

* Fix load scripts to only try to unload modules loaded,
  this prevents errors to users which they don't need to
  see
* Handle zd1211rw name change, we missed a few scripts to
  fix

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

6 files changed, 79 insertions, 88 deletions

diff --git a/Makefile b/Makefile
index 4e81c89..014b81d 100644
--- a/Makefile
+++ b/Makefile
@@ -29,19 +29,12 @@ modules:
 	$(MAKE) -C $(KLIB_BUILD) M=$(PWD) modules
 
 clean:
-	$(MAKE) -C $(KLIB_BUILD) M=$(PWD) clean
+	@if [ -d net ]; then \
+		$(MAKE) -C $(KLIB_BUILD) M=$(PWD) clean ;\
+	fi
 	@rm -f *.symvers
 
 install: modules
-	@# Previous versions of compat installed stuff into different
-	@# directories lets make sure we remove that suff for now.
-	@rm -rf $(KLIB)/$(KMODDIR)/wireless/
-	@rm -rf $(KLIB)/$(KMODDIR)/mac80211/
-	@rm -rf $(KLIB)/$(KMODDIR)/drivers/ath5k/
-	@rm -rf $(KLIB)/$(KMODDIR)/drivers/iwlwifi/
-	@rm -rf $(KLIB)/$(KMODDIR)/drivers/b43/
-	@rm -rf $(KLIB)/$(KMODDIR)/drivers/ssb/
-	@rm -rf $(KLIB)/$(KMODDIR)/drivers/zd1211rw-mac80211/
 	@$(MAKE) -C $(KLIB_BUILD) M=$(PWD) $(KMODDIR_ARG) $(KMODPATH_ARG) \
 		modules_install
 	@# All the scripts we can use
@@ -82,8 +75,8 @@ install: modules
 	@modprobe -l ieee80211_crypt
 	@modprobe -l libertas_cs
 	@modprobe -l ub8xxx
-	@modprobe -l p54pci
-	@modprobe -l p54usb
+	@modprobe -l p54_pci
+	@modprobe -l p54_usb
 	@modprobe -l rt2400pci
 	@modprobe -l rt2500pci
 	@modprobe -l rt2500usb
@@ -93,7 +86,7 @@ install: modules
 	@modprobe -l rtl8187
 	@# rc80211_simple is no longer a module
 	@#modprobe -l rc80211_simple
-	@modprobe -l zd1211rw-mac80211
+	@modprobe -l zd1211rw
 	@echo 
 	@echo Now run: make load
 	@echo
@@ -145,7 +138,7 @@ uninstall:
 	@modprobe -l rtl8187
 	@# rc80211_simple is no longer a module
 	@#modprobe -l rc80211_simple
-	@modprobe -l zd1211rw-mac80211
+	@modprobe -l zd1211rw
 	@# Old kernels have ieee80211softmac, this will be removed soon :)
 	@modprobe -l ieee80211softmac
 	@
diff --git a/compat/compat.diff b/compat/compat.diff
index a64e0d9..9798e46 100644
--- a/compat/compat.diff
+++ b/compat/compat.diff
@@ -431,44 +431,6 @@
 -obj-$(CONFIG_THINKPAD_ACPI)	+= thinkpad_acpi.o
 -obj-$(CONFIG_FUJITSU_LAPTOP)	+= fujitsu-laptop.o
  obj-$(CONFIG_EEPROM_93CX6)	+= eeprom_93cx6.o
---- a/drivers/net/wireless/libertas/dev.h	2007-11-15 20:19:33.000000000 -0500
-+++ b/drivers/net/wireless/libertas/dev.h	2007-11-15 20:27:51.000000000 -0500
-@@ -11,6 +11,7 @@
- #include <linux/ethtool.h>
- #include <linux/debugfs.h>
- #include <net/ieee80211.h>
-+#include <net/compat.h>
- 
- #include "defs.h"
- #include "scan.h"
---- a/drivers/net/wireless/libertas/ethtool.c	2007-11-16 19:05:35.000000000 -0500
-+++ b/drivers/net/wireless/libertas/ethtool.c	2007-11-16 19:06:41.000000000 -0500
-@@ -143,6 +143,7 @@
- 	lbs_deb_enter(LBS_DEB_ETHTOOL);
- }
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24))
- static int lbs_ethtool_get_sset_count(struct net_device * dev, int sset)
- {
- 	switch (sset) {
-@@ -152,6 +153,7 @@
- 		return -EOPNOTSUPP;
- 	}
- }
-+#endif
- 
- static void lbs_ethtool_get_strings(struct net_device *dev,
- 					  u32 stringset,
-@@ -177,7 +179,9 @@
- 	.get_drvinfo = lbs_ethtool_get_drvinfo,
- 	.get_eeprom =  lbs_ethtool_get_eeprom,
- 	.get_eeprom_len = lbs_ethtool_get_eeprom_len,
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24))
- 	.get_sset_count = lbs_ethtool_get_sset_count,
-+#endif
- 	.get_ethtool_stats = lbs_ethtool_get_stats,
- 	.get_strings = lbs_ethtool_get_strings,
- };
 --- a/net/mac80211/util.c	2007-11-27 18:13:44.000000000 -0500
 +++ b/net/mac80211/util.c	2007-11-27 18:13:45.000000000 -0500
 @@ -20,7 +20,9 @@
@@ -550,8 +512,53 @@
  obj-$(CONFIG_LIBERTAS)		+= libertas/
  
  rtl8180-objs		:= rtl8180_dev.o rtl8180_rtl8225.o rtl8180_sa2400.o rtl8180_max2820.o
---- a/net/mac80211/ieee80211.c	2007-12-05 20:41:35.000000000 -0500
-+++ b/net/mac80211/ieee80211.c	2007-12-05 20:41:43.000000000 -0500
+--- a/net/wireless/Makefile	2007-12-06 01:00:12.000000000 -0500
++++ b/net/wireless/Makefile	2007-12-06 01:01:51.000000000 -0500
+@@ -1,4 +1,3 @@
+-obj-$(CONFIG_WIRELESS_EXT) += wext.o
+ obj-$(CONFIG_CFG80211) += cfg80211.o
+ 
+ cfg80211-y += core.o sysfs.o radiotap.o
+--- a/drivers/net/wireless/libertas/dev.h	2007-12-18 12:49:31.000000000 -0500
++++ b/drivers/net/wireless/libertas/dev.h	2007-12-18 12:53:34.000000000 -0500
+@@ -10,6 +10,7 @@
+ #include <linux/wireless.h>
+ #include <linux/ethtool.h>
+ #include <linux/debugfs.h>
++#include <net/compat.h>
+ 
+ #include "defs.h"
+ #include "scan.h"
+--- a/drivers/net/wireless/libertas/ethtool.c	2007-12-18 12:54:21.000000000 -0500
++++ b/drivers/net/wireless/libertas/ethtool.c	2007-12-18 12:54:21.000000000 -0500
+@@ -144,6 +144,7 @@
+ 	lbs_deb_enter(LBS_DEB_ETHTOOL);
+ }
+ 
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24))
+ static int lbs_ethtool_get_sset_count(struct net_device * dev, int sset)
+ {
+ 	switch (sset) {
+@@ -153,6 +154,7 @@
+ 		return -EOPNOTSUPP;
+ 	}
+ }
++#endif
+ 
+ static void lbs_ethtool_get_strings(struct net_device *dev,
+ 					  u32 stringset,
+@@ -221,7 +223,9 @@
+ 	.get_drvinfo = lbs_ethtool_get_drvinfo,
+ 	.get_eeprom =  lbs_ethtool_get_eeprom,
+ 	.get_eeprom_len = lbs_ethtool_get_eeprom_len,
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24))
+ 	.get_sset_count = lbs_ethtool_get_sset_count,
++#endif
+ 	.get_ethtool_stats = lbs_ethtool_get_stats,
+ 	.get_strings = lbs_ethtool_get_strings,
+ 	.get_wol = lbs_ethtool_get_wol,
+--- a/net/mac80211/ieee80211.c	2007-12-18 13:04:16.000000000 -0500
++++ b/net/mac80211/ieee80211.c	2007-12-18 13:04:25.000000000 -0500
 @@ -21,7 +21,9 @@
  #include <linux/wireless.h>
  #include <linux/rtnetlink.h>
@@ -562,17 +569,7 @@
  #include <net/cfg80211.h>
  
  #include "ieee80211_i.h"
-@@ -432,7 +434,9 @@
- void ieee80211_if_setup(struct net_device *dev)
- {
- 	ether_setup(dev);
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24))
- 	dev->header_ops = &ieee80211_header_ops;
-+#endif
- 	dev->hard_start_xmit = ieee80211_subif_start_xmit;
- 	dev->wireless_handlers = &ieee80211_iw_handler_def;
- 	dev->set_multicast_list = ieee80211_set_multicast_list;
-@@ -1068,7 +1072,9 @@
+@@ -1067,7 +1069,9 @@
  	mdev->open = ieee80211_master_open;
  	mdev->stop = ieee80211_master_stop;
  	mdev->type = ARPHRD_IEEE80211;
@@ -582,10 +579,3 @@
  	mdev->set_multicast_list = ieee80211_master_set_multicast_list;
  
  	sdata->type = IEEE80211_IF_TYPE_AP;
---- a/net/wireless/Makefile	2007-12-06 01:00:12.000000000 -0500
-+++ b/net/wireless/Makefile	2007-12-06 01:01:51.000000000 -0500
-@@ -1,4 +1,3 @@
--obj-$(CONFIG_WIRELESS_EXT) += wext.o
- obj-$(CONFIG_CFG80211) += cfg80211.o
- 
- cfg80211-y += core.o sysfs.o radiotap.o
diff --git a/scripts/admin-clean.sh b/scripts/admin-clean.sh
index 6fca6e3..703b3f5 100755
--- a/scripts/admin-clean.sh
+++ b/scripts/admin-clean.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
-make clean
+if [ -d net ] ; then
+	make clean
+fi
 rm -rf net drivers include Module.symvers git-describe
 echo "Cleaned wireless-compat-2.6"
diff --git a/scripts/b43load b/scripts/b43load
index 0b9fb83..5114ffa 100755
--- a/scripts/b43load
+++ b/scripts/b43load
@@ -15,16 +15,19 @@ USAGE="Usage: $0 [ b43 | bcm43xx ]"
 
 # Default behavior: unload bcm43xx and load b43 and b43legacy
 if [ $# -eq 0 ]; then
-	b43enable b43
-	exit
+	1=b43
 elif [ $# -ne 1 ]; then
-		echo "$USAGE"
-		exit
+	echo "$USAGE"
+	exit
 fi
 
 MODULE=$1
 if [ "$MODULE" == "b43" ]; then
-	modprobe -r --ignore-remove bcm43xx
+        grep bcm43xx /proc/modules 2>&1 > /dev/null
+        if [ $? -eq 0 ]; then
+                echo Unloading $i...
+		modprobe -r --ignore-remove bcm43xx
+        fi
 	# Enables both b43 and b43legacy
 	b43enable b43
 	modprobe b43
diff --git a/scripts/load.sh b/scripts/load.sh
index 8decc2a..c38a1f4 100755
--- a/scripts/load.sh
+++ b/scripts/load.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
-MODULES="ipw2100 ipw2200 libertas_cs ub8xxx"
+MODULES="ipw2100 ipw2200 libertas_cs usb8xxx"
+MODULES="$MODULES p54pci p54usb"
+MODULES="$MODULES adm8211 zd1211rw"
+MODULES="$MODULES rtl8180 rtl8187"
 MODULES="$MODULES p54pci p54usb"
-MODULES="$MODULES adm8211"
-MODULES="$MODULES zd1211rw-mac80211 rtl8180 rtl8187"
-MODULES="$MODULES p54pci p54usb iwl3945 zd1211rw-mac80211 rtl8180 rtl8187"
 MODULES="$MODULES iwl3945 iwl4965"
 MODULES="$MODULES rtl8180 rtl8187"
 MODULES="$MODULES rtl8180 rtl8187"
diff --git a/scripts/unload.sh b/scripts/unload.sh
index a8c21a2..09f1cbc 100755
--- a/scripts/unload.sh
+++ b/scripts/unload.sh
@@ -2,11 +2,11 @@
 
 # The old stack drivers and the mac80211 rc80211_simple modules 
 # which is no longer on recent kernels (its internal)
-OLD_MODULES="rc80211_simple zd1211rw bcm43xx"
+OLD_MODULES="rc80211_simple zd1211rw zd1211rw-mac80211 bcm43xx"
 MODULES="$OLD_MODULES"
-MODULES="$MODULES ieee80211softmac ieee80211_crypt ieee80211"
 MODULES="$MODULES ipw2100 ipw2200"
-MODULES="$MODULES libertas libertas_cs ub8xxx"
+MODULES="$MODULES libertas_cs usb8xxx libertas"
+MODULES="$MODULES ieee80211softmac ieee80211_crypt ieee80211"
 MODULES="$MODULES adm8211"
 MODULES="$MODULES b43 b43legacy"
 MODULES="$MODULES iwl3945 iwl4965"
@@ -33,12 +33,15 @@ if [ -f $IPW3945D ]; then
 fi
 
 grep ath_pci /proc/modules 2>&1 > /dev/null
-if [ $?  -eq 0 ]; then
+if [ $? -eq 0 ]; then
 	echo "MadWifi driver is loaded, going to try to unload it..."
 	./scripts/madwifi-unload
 fi
 
 for i in $MODULES; do
-	echo Unloading $i...
-	modprobe -r --ignore-remove $i
+	grep $i /proc/modules 2>&1 > /dev/null
+	if [ $? -eq 0 ]; then
+		echo Unloading $i...
+		modprobe -r --ignore-remove $i
+	fi
 done