mac80211: update to latest version from trunk

[openwrt-10.03/.git] / package / mac80211 / patches / 201-ath5k-WAR-for-AR71xx-PCI-bug.patch

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
index b216b9dbeb4b9600a355aea24f070e4000eb2b7a..c1f18af080c79a8fa10210dc0bff36d7c774b085 100644 (file)
--- a/package/mac80211/patches/201-ath5k-WAR-for-AR71xx-PCI-bug.patch
+++ b/package/mac80211/patches/201-ath5k-WAR-for-AR71xx-PCI-bug.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath5k/initvals.c
 +++ b/drivers/net/wireless/ath/ath5k/initvals.c
-@@ -58,8 +58,14 @@ static const struct ath5k_ini ar5210_ini
+@@ -57,8 +57,14 @@ static const struct ath5k_ini ar5210_ini
        { AR5K_IMR,             0 },
        { AR5K_IER,             AR5K_IER_DISABLE },
        { AR5K_BSR,             0, AR5K_INI_READ },
@@ -9,7 +9,7 @@
        { AR5K_RXCFG,           AR5K_DMASIZE_128B },
 +#else
 +      /* WAR for AR71xx PCI bug */
-+      { AR5K_TXCFG,           AR5K_DMASIZE_4B },
++      { AR5K_TXCFG,           AR5K_DMASIZE_128B },
 +      { AR5K_RXCFG,           AR5K_DMASIZE_4B },
 +#endif
        { AR5K_CFG,             AR5K_INIT_CFG },
@@ -17,7 +17,7 @@
        { AR5K_RXNOFRM,         8 },
 --- a/drivers/net/wireless/ath/ath5k/dma.c
 +++ b/drivers/net/wireless/ath/ath5k/dma.c
-@@ -787,10 +787,18 @@ void ath5k_hw_dma_init(struct ath5k_hw *
+@@ -786,10 +786,18 @@ void ath5k_hw_dma_init(struct ath5k_hw *
         * guess we can tweak it and see how it goes ;-)
         */
        if (ah->ah_version != AR5K_AR5210) {
@@ -29,7 +29,7 @@
 +#else
 +              /* WAR for AR71xx PCI bug */
 +              AR5K_REG_WRITE_BITS(ah, AR5K_TXCFG,
-+                      AR5K_TXCFG_SDMAMR, AR5K_DMASIZE_4B);
++                      AR5K_TXCFG_SDMAMR, AR5K_DMASIZE_128B);
 +              AR5K_REG_WRITE_BITS(ah, AR5K_RXCFG,
 +                      AR5K_RXCFG_SDMAMW, AR5K_DMASIZE_4B);
 +#endif