[PATCH 1/4] compat-2.6: update compat.diff

[PATCH 1/4] compat-2.6: update compat.diff

[Hauke Mehrtens]

In kernel versions > 2.9.28 linux/etherdevice.h includes asm/unaligned.h.
This is needed by net/mac80211/key.c.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 compat/compat.diff |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/compat/compat.diff b/compat/compat.diff
index 725aadf..3ee9e86 100644
--- a/compat/compat.diff
+++ b/compat/compat.diff
@@ -542,6 +542,18 @@
  	if (ieee80211_vif_is_mesh(&sdata->vif) &&
  	    params && params->mesh_id_len)
  		ieee80211_sdata_set_mesh_id(sdata,
+--- a/net/mac80211/key.c
++++ b/net/mac80211/key.c
+@@ -21,6 +21,9 @@
+ #include "aes_ccm.h"
+ #include "aes_cmac.h"
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29))
++#include <asm/unaligned.h>
++#endif
+ 
+ /**
+  * DOC: Key handling basics
 --- a/net/mac80211/main.c	2009-04-28 15:34:50.000000000 -0700
 +++ b/net/mac80211/main.c	2009-04-28 15:35:06.000000000 -0700
 @@ -469,6 +469,7 @@
-- 
1.6.2.1

[PATCH 2/4] compat-2.6: Add WL12XX driver.

[Hauke Mehrtens]

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 compat/compat.diff      |   30 ++++++++++++++++++++++++------
 config.mk               |    6 ++++++
 scripts/admin-update.sh |   10 ++++++++++
 3 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/compat/compat.diff b/compat/compat.diff
index 3ee9e86..1c05577 100644
--- a/compat/compat.diff
+++ b/compat/compat.diff
@@ -181,12 +181,6 @@
  obj-$(CONFIG_LIBERTAS)		+= libertas/
  
  obj-$(CONFIG_LIBERTAS_THINFIRM)	+= libertas_tf/
-@@ -58,5 +32,3 @@ obj-$(CONFIG_P54_COMMON)	+= p54/
- obj-$(CONFIG_ATH_COMMON)	+= ath/
- 
- obj-$(CONFIG_MAC80211_HWSIM)	+= mac80211_hwsim.o
--
--obj-$(CONFIG_WL12XX)	+= wl12xx/
 --- a/drivers/net/wireless/b43/pcmcia.c
 +++ b/drivers/net/wireless/b43/pcmcia.c
 @@ -87,7 +87,11 @@ static int __devinit b43_pcmcia_probe(struct pcmcia_device *dev)
@@ -464,6 +458,30 @@
  
  	tmp = RNDIS_PACKET_TYPE_DIRECTED | RNDIS_PACKET_TYPE_BROADCAST;
  	retval = rndis_set_oid(usbdev, OID_GEN_CURRENT_PACKET_FILTER, &tmp,
+--- a/drivers/net/wireless/wl12xx/main.c
++++ b/drivers/net/wireless/wl12xx/main.c
+@@ -26,6 +26,9 @@
+ #include <linux/firmware.h>
+ #include <linux/delay.h>
+ #include <linux/irq.h>
++#if (LINUX_VERSION_CODE == KERNEL_VERSION(2,6,28))
++#include <linux/device.h>
++#endif
+ #include <linux/spi/spi.h>
+ #include <linux/crc32.h>
+ #include <linux/etherdevice.h>
+--- a/drivers/net/wireless/wl12xx/spi.c
++++ b/drivers/net/wireless/wl12xx/spi.c
+@@ -23,6 +23,9 @@
+ 
+ #include <linux/module.h>
+ #include <linux/crc7.h>
++#if (LINUX_VERSION_CODE == KERNEL_VERSION(2,6,28))
++#include <linux/device.h>
++#endif
+ #include <linux/spi/spi.h>
+ 
+ #include "wl12xx.h"
 --- a/include/net/cfg80211.h
 +++ b/include/net/cfg80211.h
 @@ -23,6 +23,7 @@
diff --git a/config.mk b/config.mk
index a3296d3..f94b37b 100644
--- a/config.mk
+++ b/config.mk
@@ -280,6 +280,12 @@ endif
 
 endif # end of USB driver list
 
+ifneq ($(CONFIG_SPI_MASTER),)
+
+CONFIG_WL12XX=m
+
+endif # end of SPI driver list
+
 # Common rt2x00 requirements
 ifeq ($(NEED_RT2X00),y)
 CONFIG_RT2X00=m
diff --git a/scripts/admin-update.sh b/scripts/admin-update.sh
index 574d4e3..1616844 100755
--- a/scripts/admin-update.sh
+++ b/scripts/admin-update.sh
@@ -24,6 +24,8 @@ INCLUDE_LINUX="$INCLUDE_LINUX ath9k_platform.h"
 # For rndis_wext
 INCLUDE_LINUX_USB="usbnet.h rndis_host.h"
 
+INCLUDE_LINUX_SPI="wl12xx.h"
+
 # The good new yummy stuff
 INCLUDE_NET="cfg80211.h ieee80211_radiotap.h iw_handler.h"
 INCLUDE_NET="$INCLUDE_NET mac80211.h wext.h lib80211.h regulatory.h"
@@ -61,6 +63,7 @@ DRIVERS="$DRIVERS drivers/net/wireless/p54"
 DRIVERS="$DRIVERS drivers/net/wireless/rtl818x"
 DRIVERS="$DRIVERS drivers/net/wireless/libertas_tf"
 DRIVERS="$DRIVERS drivers/net/wireless/ipw2x00"
+DRIVERS="$DRIVERS drivers/net/wireless/wl12xx"
 
 # Drivers that belong the the wireless directory
 DRIVER_FILES="adm8211.c  adm8211.h"
@@ -71,6 +74,7 @@ DRIVER_FILES="$DRIVER_FILES mwl8k.c"
 
 mkdir -p include/linux/ include/net/ include/linux/usb \
 	include/linux/unaligned \
+	include/linux/spi \
 	net/mac80211/ net/wireless/ \
 	drivers/ssb/ \
 	drivers/net/usb/ \
@@ -98,6 +102,12 @@ for i in $INCLUDE_LINUX_USB; do
 	cp $GIT_TREE/$DIR/$i $DIR/
 done
 
+DIR="include/linux/spi"
+for i in $INCLUDE_LINUX_SPI; do
+	echo "Copying $GIT_TREE/$DIR/$i"
+	cp $GIT_TREE/$DIR/$i $DIR/
+done
+
 # net/wireless and net/mac80211
 for i in $NET_DIRS; do
 	echo "Copying $GIT_TREE/net/$i/*.[ch]"
-- 
1.6.2.1

[PATCH 3/4] compat-2.6: Add libertas_spi module.

[Hauke Mehrtens]

Clean up libertas stuff in config.mk

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 config.mk               |   35 +++++++++++++++++++++++------------
 scripts/admin-update.sh |    2 +-
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/config.mk b/config.mk
index f94b37b..0a2cbb3 100644
--- a/config.mk
+++ b/config.mk
@@ -235,6 +235,14 @@ CONFIG_MWL8K=m
 endif
 ## end of PCI
 
+ifneq ($(CONFIG_PCMCIA),)
+
+CONFIG_LIBERTAS_CS=m
+NEED_LIBERTAS=y
+
+endif
+## end of PCMCIA
+
 # This is required for some cards
 CONFIG_EEPROM_93CX6=m
 
@@ -278,14 +286,27 @@ CONFIG_RT73USB=m
 NEED_RT2X00_FIRMWARE=y
 endif
 
+CONFIG_LIBERTAS_THINFIRM_USB=m
+CONFIG_LIBERTAS_USB=m
+NEED_LIBERTAS=y
+
 endif # end of USB driver list
 
 ifneq ($(CONFIG_SPI_MASTER),)
 
 CONFIG_WL12XX=m
+CONFIG_LIBERTAS_SPI=m
+NEED_LIBERTAS=y
 
 endif # end of SPI driver list
 
+ifneq ($(CONFIG_MMC),)
+
+CONFIG_LIBERTAS_SDIO=m
+NEED_LIBERTAS=y
+
+endif # end of SDIO driver list
+
 # Common rt2x00 requirements
 ifeq ($(NEED_RT2X00),y)
 CONFIG_RT2X00=m
@@ -317,19 +338,9 @@ CONFIG_SSB=m
 CONFIG_SSB_SPROM=y
 # CONFIG_SSB_DEBUG=y
 
-ifneq ($(CONFIG_USB),)
-ifneq ($(CONFIG_LIBERTAS_THINFIRM_USB),m)
-CONFIG_LIBERTAS_USB=m
-NEED_LIBERTAS=y
-endif
-endif
-ifneq ($(CONFIG_PCMCIA),)
-CONFIG_LIBERTAS_CS=m
-NEED_LIBERTAS=y
-endif
 ifeq ($(NEED_LIBERTAS),y)
+CONFIG_LIBERTAS_THINFIRM=m
 CONFIG_LIBERTAS=m
-# Libertas uses the old stack but not fully, it will soon 
-# be cleaned.
+# CONFIG_LIBERTAS_DEBUG=y
 endif
 
diff --git a/scripts/admin-update.sh b/scripts/admin-update.sh
index 1616844..ae42894 100755
--- a/scripts/admin-update.sh
+++ b/scripts/admin-update.sh
@@ -24,7 +24,7 @@ INCLUDE_LINUX="$INCLUDE_LINUX ath9k_platform.h"
 # For rndis_wext
 INCLUDE_LINUX_USB="usbnet.h rndis_host.h"
 
-INCLUDE_LINUX_SPI="wl12xx.h"
+INCLUDE_LINUX_SPI="wl12xx.h libertas_spi.h"
 
 # The good new yummy stuff
 INCLUDE_NET="cfg80211.h ieee80211_radiotap.h iw_handler.h"
-- 
1.6.2.1

[PATCH 4/4] compat-2.6: Fixed module_disable function with old module-init-tools.

[Hauke Mehrtens]

The behavior of modprobe -l chanched. Old versions are returning
the full path and new versions only return the relative path
to the modules directory of the kernel.

Corrected some typos iwl-enable.

Thanks Brett D. Ussher for your help.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 scripts/iwl-enable |    4 ++--
 scripts/modlib.sh  |    5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/scripts/iwl-enable b/scripts/iwl-enable
index 1236deb..765195b 100755
--- a/scripts/iwl-enable
+++ b/scripts/iwl-enable
@@ -17,7 +17,7 @@ IWL_NEW="iwlagn"
 IWL_OLD="iwl4965"
 
 # Appended to module file at the end when we want to ignore one
-USAGE="Usage: $0 [ $IWL | $IWL_OLD ]"
+USAGE="Usage: $0 [ $IWL_NEW | $IWL_OLD ]"
 
 function enable_iwlagn {
 	module_disable $IWL_OLD
@@ -36,7 +36,7 @@ elif [ $# -ne 1 ]; then
 fi
 
 MODULE=$1
-if [ "$MODULE" == "iwl4954" ]; then
+if [ "$MODULE" == "iwl4965" ]; then
 	module_disable $IWL_NEW
 	module_enable $IWL_OLD
 elif [ "$MODULE" == "iwlagn" ]; then
diff --git a/scripts/modlib.sh b/scripts/modlib.sh
index 5140949..91e53f1 100755
--- a/scripts/modlib.sh
+++ b/scripts/modlib.sh
@@ -28,7 +28,7 @@ function module_disable {
 	ALL_MODULES=`find /lib/modules/$VER/ -name $MODULE_KO`
 	COUNT=1
 	CHECK=`modprobe -l $MODULE`
-	while  [ ! -z $CHECK ]; do
+	for i in $ALL_MODULES; do
 		if [[ $MODULE_COUNT -gt 1 ]]; then
 			if [[ $COUNT -eq 1 ]]; then
 				echo -en "$MODULE_COUNT $MODULE modules found "
@@ -38,7 +38,7 @@ function module_disable {
 		else
 			echo -en "Disabling $MODULE ..."
 		fi
-		mv -f /lib/modules/$VER/$CHECK /lib/modules/$VER/${CHECK}${IGNORE_SUFFIX}
+		mv -f $i ${i}${IGNORE_SUFFIX}
 		depmod -ae
 		CHECK_AGAIN=`modprobe -l $MODULE`
 		if [ "$CHECK" != "$CHECK_AGAIN" ]; then
@@ -49,7 +49,6 @@ function module_disable {
 			echo "$CHECK"
 		fi
 		let COUNT=$COUNT+1
-		CHECK=$CHECK_AGAIN
 	done
 }
 
-- 
1.6.2.1

Re: [PATCH 1/4] compat-2.6: update compat.diff

[Luis R. Rodriguez]

On Sun, May 17, 2009 at 05:47:40AM -0700, Hauke Mehrtens wrote:
> In kernel versions > 2.9.28 linux/etherdevice.h includes asm/unaligned.h.
> This is needed by net/mac80211/key.c.

All applied thanks!

  Luis