mac80211/ath5k: add workaround for the AR71xx PCI bug

SVN-Revision: 16535

diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index 1134ddcf97aaa544133dfe5e3042d0314b579b68..d793d91708f439e775feebbe3bcd79aacbeac52e 100644 (file)
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -18,7 +18,7 @@ ifneq ($(CONFIG_LINUX_2_6_21)$(CONFIG_LINUX_2_6_23)$(CONFIG_LINUX_2_6_24)$(CONFI
   PATCH_DIR:=./patches-old
 else
   PKG_VERSION:=2009-06-02
-  PKG_RELEASE:=1
+  PKG_RELEASE:=2
   PKG_SOURCE_URL:= \
        http://www.orbit-lab.org/kernel/compat-wireless-2.6/2009/06 \
        http://wireless.kernel.org/download/compat-wireless-2.6

diff --git a/package/mac80211/patches/201-ath5k-WAR-for-AR71xx-PCI-bug.patch b/package/mac80211/patches/201-ath5k-WAR-for-AR71xx-PCI-bug.patch
new file mode 100644 (file)
index 0000000..ca04786
--- /dev/null
+++ b/package/mac80211/patches/201-ath5k-WAR-for-AR71xx-PCI-bug.patch
@@ -0,0 +1,32 @@
+--- a/drivers/net/wireless/ath/ath5k/reset.c
++++ b/drivers/net/wireless/ath/ath5k/reset.c
+@@ -1297,8 +1297,14 @@ int ath5k_hw_reset(struct ath5k_hw *ah, 
+       if (ah->ah_version != AR5K_AR5210) {
+               AR5K_REG_WRITE_BITS(ah, AR5K_TXCFG,
+                       AR5K_TXCFG_SDMAMR, AR5K_DMASIZE_128B);
++#ifndef CONFIG_ATHEROS_AR71XX
+               AR5K_REG_WRITE_BITS(ah, AR5K_RXCFG,
+                       AR5K_RXCFG_SDMAMW, AR5K_DMASIZE_128B);
++#else
++              /* WAR for AR71xx PCI bug */
++              AR5K_REG_WRITE_BITS(ah, AR5K_RXCFG,
++                      AR5K_RXCFG_SDMAMW, AR5K_DMASIZE_4B);
++#endif
+       }
+ 
+       /* Pre-enable interrupts on 5211/5212*/
+--- a/drivers/net/wireless/ath/ath5k/initvals.c
++++ b/drivers/net/wireless/ath/ath5k/initvals.c
+@@ -59,7 +59,12 @@ static const struct ath5k_ini ar5210_ini
+       { AR5K_IER,             AR5K_IER_DISABLE },
+       { AR5K_BSR,             0, AR5K_INI_READ },
+       { AR5K_TXCFG,           AR5K_DMASIZE_128B },
++#ifndef CONFIG_ATHEROS_AR71XX
+       { AR5K_RXCFG,           AR5K_DMASIZE_128B },
++#else
++      /* WAR for AR71xx PCI bug */
++      { AR5K_RXCFG,           AR5K_DMASIZE_4B },
++#endif
+       { AR5K_CFG,             AR5K_INIT_CFG },
+       { AR5K_TOPS,            8 },
+       { AR5K_RXNOFRM,         8 },