aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2009-01-30 09:41:55 +0000
committerGabor Juhos <juhosg@openwrt.org>2009-01-30 09:41:55 +0000
commit3a4b459fbf96833ce5afcdfec630b290c1e9b9da (patch)
tree336d2d2b0129b671f40c0614ff666a41afb0c350
parentef33d451ba4409f4ae009de518a84425395c4cc0 (diff)
downloadupstream-3a4b459fbf96833ce5afcdfec630b290c1e9b9da.tar.gz
upstream-3a4b459fbf96833ce5afcdfec630b290c1e9b9da.tar.bz2
upstream-3a4b459fbf96833ce5afcdfec630b290c1e9b9da.zip
mac80211: update compat-wireless to 2009-01-29
SVN-Revision: 14279
-rw-r--r--package/mac80211/Makefile4
-rw-r--r--package/mac80211/patches/005-disable_ssb_build.patch4
-rw-r--r--package/mac80211/patches/320-rx_dma_unmap.patch4
3 files changed, 6 insertions, 6 deletions
diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index dabceba295..4f14e93b65 100644
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -12,11 +12,11 @@ PKG_NAME:=mac80211
PKG_RELEASE:=1
ifneq ($(CONFIG_LINUX_2_6_27)$(CONFIG_LINUX_2_6_28),)
- PKG_VERSION:=2009-01-24
+ PKG_VERSION:=2009-01-29
PKG_SOURCE_URL:= \
http://www.orbit-lab.org/kernel/compat-wireless-2.6/2009/01 \
http://wireless.kernel.org/download/compat-wireless-2.6
- PKG_MD5SUM:=5d5179b9bd2536b99dfc7e9aef34df91
+ PKG_MD5SUM:=7ad466fd68967de744ab41caddff10d9
else
PKG_VERSION:=2008-08-06
PKG_SOURCE_URL:=http://www.orbit-lab.org/kernel/compat-wireless-2.6/2008/08
diff --git a/package/mac80211/patches/005-disable_ssb_build.patch b/package/mac80211/patches/005-disable_ssb_build.patch
index 7a0f6c353f..fc253bd38b 100644
--- a/package/mac80211/patches/005-disable_ssb_build.patch
+++ b/package/mac80211/patches/005-disable_ssb_build.patch
@@ -5,8 +5,8 @@
ifeq ($(ONLY_CORE),)
obj-$(CONFIG_B44) += drivers/net/b44.o
-obj-y += drivers/ssb/ \
-- drivers/misc/ \
-+obj-y += drivers/misc/ \
+- drivers/misc/eeprom/ \
++obj-y += drivers/misc/eeprom/ \
drivers/net/usb/ \
drivers/net/wireless/
endif
diff --git a/package/mac80211/patches/320-rx_dma_unmap.patch b/package/mac80211/patches/320-rx_dma_unmap.patch
index f7cd62a7ce..a22320a6f4 100644
--- a/package/mac80211/patches/320-rx_dma_unmap.patch
+++ b/package/mac80211/patches/320-rx_dma_unmap.patch
@@ -6,7 +6,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
--- a/drivers/net/wireless/ath5k/base.c
+++ b/drivers/net/wireless/ath5k/base.c
-@@ -308,6 +308,19 @@ static inline void ath5k_txbuf_free(stru
+@@ -310,6 +310,19 @@ static inline void ath5k_txbuf_free(stru
bf->skb = NULL;
}
@@ -26,7 +26,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
/* Queues setup */
static struct ath5k_txq *ath5k_txq_setup(struct ath5k_softc *sc,
int qtype, int subtype);
-@@ -1341,7 +1354,7 @@ ath5k_desc_free(struct ath5k_softc *sc,
+@@ -1343,7 +1356,7 @@ ath5k_desc_free(struct ath5k_softc *sc,
list_for_each_entry(bf, &sc->txbuf, list)
ath5k_txbuf_free(sc, bf);
list_for_each_entry(bf, &sc->rxbuf, list)