summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-03-03 15:49:02 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-03-03 15:49:02 +0000
commita4d6b2f204fb61e7ef9049ebf31d31e37c26d538 (patch)
tree1931eaf1742a94ed5806fa6238f8a42b4649bd3b
parent370c17b44f61ef812cc2153002d859504c60ca0b (diff)
[package] mac80211: update compat-wireless to 2009-03-03, and add a new ath9k patch
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14744 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/mac80211/Makefile6
-rw-r--r--package/mac80211/patches/401-ath9k-dont-register-leds-on-ar9100.patch4
-rw-r--r--package/mac80211/patches/404-ath9k-fix-AR_TXCFG_DMASZ_MASK-value.patch29
3 files changed, 34 insertions, 5 deletions
diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index 7a4f8dd350..89a0506e73 100644
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -11,12 +11,12 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=mac80211
ifneq ($(CONFIG_LINUX_2_6_27)$(CONFIG_LINUX_2_6_28),)
- PKG_VERSION:=2009-02-25
+ PKG_VERSION:=2009-03-03
PKG_RELEASE:=1
PKG_SOURCE_URL:= \
- http://www.orbit-lab.org/kernel/compat-wireless-2.6/2009/02 \
+ http://www.orbit-lab.org/kernel/compat-wireless-2.6/2009/03 \
http://wireless.kernel.org/download/compat-wireless-2.6
- PKG_MD5SUM:=5dddce683bea04376ceee3a91902d5dd
+ PKG_MD5SUM:=285550a7ce02f936393eea768bf299db
else
PKG_VERSION:=2008-08-06
PKG_RELEASE:=2
diff --git a/package/mac80211/patches/401-ath9k-dont-register-leds-on-ar9100.patch b/package/mac80211/patches/401-ath9k-dont-register-leds-on-ar9100.patch
index 5fe8a3a1f4..a5292b0b95 100644
--- a/package/mac80211/patches/401-ath9k-dont-register-leds-on-ar9100.patch
+++ b/package/mac80211/patches/401-ath9k-dont-register-leds-on-ar9100.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/ath9k/main.c
+++ b/drivers/net/wireless/ath9k/main.c
-@@ -1024,6 +1024,9 @@ static void ath_unregister_led(struct at
+@@ -1036,6 +1036,9 @@ static void ath_unregister_led(struct at
static void ath_deinit_leds(struct ath_softc *sc)
{
@@ -10,7 +10,7 @@
cancel_delayed_work_sync(&sc->ath_led_blink_work);
ath_unregister_led(&sc->assoc_led);
sc->sc_flags &= ~SC_OP_LED_ASSOCIATED;
-@@ -1038,6 +1041,9 @@ static void ath_init_leds(struct ath_sof
+@@ -1050,6 +1053,9 @@ static void ath_init_leds(struct ath_sof
char *trigger;
int ret;
diff --git a/package/mac80211/patches/404-ath9k-fix-AR_TXCFG_DMASZ_MASK-value.patch b/package/mac80211/patches/404-ath9k-fix-AR_TXCFG_DMASZ_MASK-value.patch
new file mode 100644
index 0000000000..44b237bc02
--- /dev/null
+++ b/package/mac80211/patches/404-ath9k-fix-AR_TXCFG_DMASZ_MASK-value.patch
@@ -0,0 +1,29 @@
+From 65f2e0de53bdb745149c8d9b4e6867f8394a789b Mon Sep 17 00:00:00 2001
+From: Gabor Juhos <juhosg@openwrt.org>
+Date: Sat, 10 Jan 2009 14:27:29 +0100
+Subject: [PATCH] ath9k: fix AR_TXCFG_DMASZ_MASK value
+
+The current bitmask is invalid, because the tx dma size is a 3 bit wide
+value.
+
+Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
+---
+ drivers/net/wireless/ath9k/reg.h | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/net/wireless/ath9k/reg.h b/drivers/net/wireless/ath9k/reg.h
+index 8d85106..91442da 100644
+--- a/drivers/net/wireless/ath9k/reg.h
++++ b/drivers/net/wireless/ath9k/reg.h
+@@ -67,7 +67,7 @@
+ #define AR_DMASIZE_512B 0x00000007
+
+ #define AR_TXCFG 0x0030
+-#define AR_TXCFG_DMASZ_MASK 0x00000003
++#define AR_TXCFG_DMASZ_MASK 0x00000007
+ #define AR_TXCFG_DMASZ_4B 0
+ #define AR_TXCFG_DMASZ_8B 1
+ #define AR_TXCFG_DMASZ_16B 2
+--
+1.5.3.2
+