[backfire] backport mac80211 updates from trunk
[openwrt-10.03/.git] / package / mac80211 / patches / 201-ath5k-WAR-for-AR71xx-PCI-bug.patch
1 --- a/drivers/net/wireless/ath/ath5k/reset.c
2 +++ b/drivers/net/wireless/ath/ath5k/reset.c
3 @@ -1334,10 +1334,18 @@ int ath5k_hw_reset(struct ath5k_hw *ah, 
4          * guess we can tweak it and see how it goes ;-)
5          */
6         if (ah->ah_version != AR5K_AR5210) {
7 +#ifndef CONFIG_ATHEROS_AR71XX
8                 AR5K_REG_WRITE_BITS(ah, AR5K_TXCFG,
9                         AR5K_TXCFG_SDMAMR, AR5K_DMASIZE_128B);
10                 AR5K_REG_WRITE_BITS(ah, AR5K_RXCFG,
11                         AR5K_RXCFG_SDMAMW, AR5K_DMASIZE_128B);
12 +#else
13 +               /* WAR for AR71xx PCI bug */
14 +               AR5K_REG_WRITE_BITS(ah, AR5K_TXCFG,
15 +                       AR5K_TXCFG_SDMAMR, AR5K_DMASIZE_4B);
16 +               AR5K_REG_WRITE_BITS(ah, AR5K_RXCFG,
17 +                       AR5K_RXCFG_SDMAMW, AR5K_DMASIZE_4B);
18 +#endif
19         }
20  
21         /* Pre-enable interrupts on 5211/5212*/
22 --- a/drivers/net/wireless/ath/ath5k/initvals.c
23 +++ b/drivers/net/wireless/ath/ath5k/initvals.c
24 @@ -58,8 +58,14 @@ static const struct ath5k_ini ar5210_ini
25         { AR5K_IMR,             0 },
26         { AR5K_IER,             AR5K_IER_DISABLE },
27         { AR5K_BSR,             0, AR5K_INI_READ },
28 +#ifndef CONFIG_ATHEROS_AR71XX
29         { AR5K_TXCFG,           AR5K_DMASIZE_128B },
30         { AR5K_RXCFG,           AR5K_DMASIZE_128B },
31 +#else
32 +       /* WAR for AR71xx PCI bug */
33 +       { AR5K_TXCFG,           AR5K_DMASIZE_4B },
34 +       { AR5K_RXCFG,           AR5K_DMASIZE_4B },
35 +#endif
36         { AR5K_CFG,             AR5K_INIT_CFG },
37         { AR5K_TOPS,            8 },
38         { AR5K_RXNOFRM,         8 },