From 901e7257791f529bd5e502f35a5f7785b5b3fc88 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Mon, 26 Feb 2007 15:25:26 +0000 Subject: zd1211: Upstream upgrade to -r85. Fixes problem in recent kernels --- packages/zd1211/zd1211-r85/.mtn2git_empty | 0 packages/zd1211/zd1211-r85/makefile-unslung.patch | 48 ++++++++++++++++++++++ packages/zd1211/zd1211-r85/makefile.patch | 47 +++++++++++++++++++++ .../zd1211/zd1211-r85/unslung-iwpriv-hack.patch | 19 +++++++++ .../zd1211/zd1211-r85/unslung-writel-logging.patch | 14 +++++++ 5 files changed, 128 insertions(+) create mode 100644 packages/zd1211/zd1211-r85/.mtn2git_empty create mode 100644 packages/zd1211/zd1211-r85/makefile-unslung.patch create mode 100644 packages/zd1211/zd1211-r85/makefile.patch create mode 100644 packages/zd1211/zd1211-r85/unslung-iwpriv-hack.patch create mode 100644 packages/zd1211/zd1211-r85/unslung-writel-logging.patch (limited to 'packages/zd1211/zd1211-r85') diff --git a/packages/zd1211/zd1211-r85/.mtn2git_empty b/packages/zd1211/zd1211-r85/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/zd1211/zd1211-r85/makefile-unslung.patch b/packages/zd1211/zd1211-r85/makefile-unslung.patch new file mode 100644 index 0000000000..bc189e823f --- /dev/null +++ b/packages/zd1211/zd1211-r85/makefile-unslung.patch @@ -0,0 +1,48 @@ +--- zd1211-driver-r83.orig/Makefile 2006-07-09 04:59:42.000000000 -0500 ++++ zd1211-driver-r83/Makefile 2006-10-21 16:27:41.000000000 -0500 +@@ -4,25 +4,25 @@ + # + # + +-CC=gcc +-CPP=g++ +-LD=ld ++CC ?= gcc ++CPP ?= g++ ++LD ?= ld + rM=rm -f -r + + VERSION := $(shell uname -r) +-MODPATH := /lib/modules/$(VERSION) ++MODPATH ?= /lib/modules/$(VERSION) + + # if the kernel is 2.6.x, turn on this +-KERN_26=y ++#KERN_26=y + +-KERNEL_SOURCE=$(MODPATH)/source ++KERNEL_SOURCE ?= $(MODPATH)/source + #KERNEL_SOURCE=/usr/src/linux + + # set to 1 for zd1211b + ZD1211REV_B=0 + + SRC_DIR=src +-DEFINES=-D__KERNEL__ -DMODULE=1 ++DEFINES ?= -D__KERNEL__ -DMODULE=1 + + + +@@ -228,9 +228,9 @@ + depmod -a $(VERSION) + + #for apdbg +- gcc -o apdbg apdbg.c +- chmod +x apdbg +- cp ./apdbg /sbin/apdbg ++# gcc -o apdbg apdbg.c ++# chmod +x apdbg ++# cp ./apdbg /sbin/apdbg + + clean: + rm -rf .tmp_versions .*.cmd *.ko *.mod.c *.mod.o *.o $(SRC_DIR)/*.o $(SRC_DIR)/.*.o.cmd diff --git a/packages/zd1211/zd1211-r85/makefile.patch b/packages/zd1211/zd1211-r85/makefile.patch new file mode 100644 index 0000000000..adc2bd416d --- /dev/null +++ b/packages/zd1211/zd1211-r85/makefile.patch @@ -0,0 +1,47 @@ +--- zd1211-driver-r83/Makefile.orig 2006-09-02 16:00:00.000000000 +0200 ++++ zd1211-driver-r83/Makefile 2006-09-02 16:01:57.000000000 +0200 +@@ -4,10 +4,10 @@ + # + # + +-CC=gcc +-CPP=g++ +-LD=ld +-rM=rm -f -r ++#CC=gcc ++#CPP=g++ ++#LD=ld ++#rM=rm -f -r + + VERSION := $(shell uname -r) + MODPATH := /lib/modules/$(VERSION) +@@ -15,14 +15,14 @@ + # if the kernel is 2.6.x, turn on this + KERN_26=y + +-KERNEL_SOURCE=$(MODPATH)/source ++KERNEL_SOURCE ?= $(MODPATH)/source + #KERNEL_SOURCE=/usr/src/linux + + # set to 1 for zd1211b + ZD1211REV_B=0 + + SRC_DIR=src +-DEFINES=-D__KERNEL__ -DMODULE=1 ++DEFINES ?= -D__KERNEL__ -DMODULE=1 + + + +@@ -228,9 +228,9 @@ + depmod -a $(VERSION) + + #for apdbg +- gcc -o apdbg apdbg.c +- chmod +x apdbg +- cp ./apdbg /sbin/apdbg ++# gcc -o apdbg apdbg.c ++# chmod +x apdbg ++# cp ./apdbg /sbin/apdbg + + clean: + rm -rf .tmp_versions .*.cmd *.ko *.mod.c *.mod.o *.o $(SRC_DIR)/*.o $(SRC_DIR)/.*.o.cmd diff --git a/packages/zd1211/zd1211-r85/unslung-iwpriv-hack.patch b/packages/zd1211/zd1211-r85/unslung-iwpriv-hack.patch new file mode 100644 index 0000000000..64f3806140 --- /dev/null +++ b/packages/zd1211/zd1211-r85/unslung-iwpriv-hack.patch @@ -0,0 +1,19 @@ +--- zd1211-driver-r74/src/zd1205.c~ 2006-04-16 09:42:15.000000000 -0500 ++++ zd1211-driver-r74/src/zd1205.c 2006-04-27 12:29:03.000000000 -0500 +@@ -349,8 +349,14 @@ + { SIOCIWFIRSTPRIV + 0xA, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "connect" }, + { SIOCIWFIRSTPRIV + 0xB, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "set_mac_mode" }, + { SIOCIWFIRSTPRIV + 0xC, 0, IW_PRIV_TYPE_CHAR | 12, "get_mac_mode" }, +- { SIOCIWFIRSTPRIV + 0xD, 0, 0, "save_conf" /* has been removed */ }, +- { SIOCIWFIRSTPRIV + 0xE, 0, 0, "load_conf" /* has been removed */ }, ++// HACK HACK HACK - The following two lines are commented out in order to make ++// iwpriv work on Unslung (2.4.22 kernel) - this kernel's Wireless Extensions ++// can only handle up to 16 iwpriv entries in this structure. Yes, the correct ++// fix is to patch the Wireless Extensions in the Unslung kernel. This hack ++// should be removed when that's actually done. ~mwester 27APR2006 ++// { SIOCIWFIRSTPRIV + 0xD, 0, 0, "save_conf" /* has been removed */ }, ++// { SIOCIWFIRSTPRIV + 0xE, 0, 0, "load_conf" /* has been removed */ }, ++// End of HACK + { SIOCIWFIRSTPRIV + 0xF, 0, IW_PRIV_TYPE_CHAR | 14, "get_Region" }, + { SIOCIWFIRSTPRIV + 0x9,IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "set_Region" }, + }; diff --git a/packages/zd1211/zd1211-r85/unslung-writel-logging.patch b/packages/zd1211/zd1211-r85/unslung-writel-logging.patch new file mode 100644 index 0000000000..00d54d7d68 --- /dev/null +++ b/packages/zd1211/zd1211-r85/unslung-writel-logging.patch @@ -0,0 +1,14 @@ +--- zd1211-driver-r74/src/zd1211.c~ 2006-04-09 12:28:06.000000000 -0500 ++++ zd1211-driver-r74/src/zd1211.c 2006-04-27 12:38:55.000000000 -0500 +@@ -652,7 +652,10 @@ + count++; + + if (count > 5) { +- printk(KERN_ERR "1211_readl failed for 5 attempts...Very Serious"); ++// You are going to see this often enough on Unslung that we might as well put it in ++// the syslog and fix it so it has a nl on the end. Sigh. ~mwester, 27APR06 ++// ++ printk(KERN_ERR "1211_readl failed for 5 attempts...Very Serious\n"); + break; + } + } -- cgit v1.2.3