diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2009-03-24 15:11:16 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2009-03-24 15:11:16 +0000 |
| commit | e5494fd6f03732193b22ea2b4e2898a7fd34f023 (patch) | |
| tree | db68fd2d6dd704f97d093c4b1c8594429add1514 /package | |
| parent | 2094a9de3e4764f6952d92230236f6187e81fd80 (diff) | |
| download | upstream-e5494fd6f03732193b22ea2b4e2898a7fd34f023.tar.gz upstream-e5494fd6f03732193b22ea2b4e2898a7fd34f023.tar.bz2 upstream-e5494fd6f03732193b22ea2b4e2898a7fd34f023.zip | |
[mac80211] update compat-wireless to 2009-03-24
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15019 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
| -rw-r--r-- | package/mac80211/Makefile | 4 | ||||
| -rw-r--r-- | package/mac80211/patches/007-remove_unused_stuff.patch | 22 | ||||
| -rw-r--r-- | package/mac80211/patches/510-b43-mask-phyerr-irq.patch | 6 |
3 files changed, 19 insertions, 13 deletions
diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile index b1e5a609f4..5e83d4fc02 100644 --- a/package/mac80211/Makefile +++ b/package/mac80211/Makefile @@ -17,12 +17,12 @@ ifneq ($(CONFIG_LINUX_2_6_21)$(CONFIG_LINUX_2_6_23)$(CONFIG_LINUX_2_6_24)$(CONFI PKG_MD5SUM:=9563ceeed86bca0859ad5f010623277c PATCH_DIR:=./patches-old else - PKG_VERSION:=2009-03-18 + PKG_VERSION:=2009-03-24 PKG_RELEASE:=1 PKG_SOURCE_URL:= \ http://www.orbit-lab.org/kernel/compat-wireless-2.6/2009/03 \ http://wireless.kernel.org/download/compat-wireless-2.6 - PKG_MD5SUM:=d46d230f62aed9bdec7a1f168feb221b + PKG_MD5SUM:=9e0574d123b6d6827c56a7c0042173fb endif PKG_SOURCE:=compat-wireless-$(PKG_VERSION).tar.bz2 diff --git a/package/mac80211/patches/007-remove_unused_stuff.patch b/package/mac80211/patches/007-remove_unused_stuff.patch index 417531f004..64be86468a 100644 --- a/package/mac80211/patches/007-remove_unused_stuff.patch +++ b/package/mac80211/patches/007-remove_unused_stuff.patch @@ -1,7 +1,5 @@ -Index: compat-wireless-2009-03-18/config.mk -=================================================================== ---- compat-wireless-2009-03-18.orig/config.mk 2009-03-20 17:10:09.000000000 +0100 -+++ compat-wireless-2009-03-18/config.mk 2009-03-20 17:11:31.000000000 +0100 +--- a/config.mk ++++ b/config.mk @@ -104,10 +104,10 @@ CONFIG_MAC80211_MESH=y CONFIG_CFG80211=m # CONFIG_CFG80211_REG_DEBUG=y @@ -165,7 +163,7 @@ Index: compat-wireless-2009-03-18/config.mk # USB Drivers ifneq ($(CONFIG_USB),) -@@ -249,15 +249,15 @@ CONFIG_ZD1211RW=m +@@ -249,22 +249,22 @@ CONFIG_ZD1211RW=m # is only wireless RNDIS chip known to date. # Note: this depends on CONFIG_USB_NET_RNDIS_HOST and CONFIG_USB_NET_CDCETHER # it also requires new RNDIS_HOST and CDC_ETHER modules which we add @@ -184,9 +182,19 @@ Index: compat-wireless-2009-03-18/config.mk -CONFIG_AT76C50X_USB=m +# CONFIG_AT76C50X_USB=m + # Activate AR9170 support only on kernel >= 2.6.28. + # The needed USB poison feature was added in this kernel release. + ifeq ($(shell test $(KERNEL_SUBLEVEL) -ge 28 && echo yes),yes) +-CONFIG_AR9170_COMMON=m +-CONFIG_AR9170_USB=m +-CONFIG_AR9170_LEDS=y ++# CONFIG_AR9170_COMMON=m ++# CONFIG_AR9170_USB=m ++# CONFIG_AR9170_LEDS=y + endif + # RT2500USB does not require firmware - CONFIG_RT2500USB=m -@@ -294,20 +294,20 @@ CONFIG_P54_COMMON=m +@@ -302,20 +302,20 @@ CONFIG_P54_COMMON=m # Sonics Silicon Backplane diff --git a/package/mac80211/patches/510-b43-mask-phyerr-irq.patch b/package/mac80211/patches/510-b43-mask-phyerr-irq.patch index 54f2d4056f..fcf29946d3 100644 --- a/package/mac80211/patches/510-b43-mask-phyerr-irq.patch +++ b/package/mac80211/patches/510-b43-mask-phyerr-irq.patch @@ -12,10 +12,8 @@ So as a workaround we ignore the PHY TX error. --mb -Index: compat-wireless-2009-03-18/drivers/net/wireless/b43/b43.h -=================================================================== ---- compat-wireless-2009-03-18.orig/drivers/net/wireless/b43/b43.h 2009-03-19 15:26:08.000000000 +0100 -+++ compat-wireless-2009-03-18/drivers/net/wireless/b43/b43.h 2009-03-19 15:26:52.000000000 +0100 +--- a/drivers/net/wireless/b43/b43.h ++++ b/drivers/net/wireless/b43/b43.h @@ -422,7 +422,6 @@ enum { B43_IRQ_ATIM_END | \ B43_IRQ_PMQ | \ |