[mac80211] Update to compat-wireless-2009-08-15
[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 @@ -1370,8 +1370,14 @@ int ath5k_hw_reset(struct ath5k_hw *ah, 
4         if (ah->ah_version != AR5K_AR5210) {
5                 AR5K_REG_WRITE_BITS(ah, AR5K_TXCFG,
6                         AR5K_TXCFG_SDMAMR, AR5K_DMASIZE_128B);
7 +#ifndef CONFIG_ATHEROS_AR71XX
8                 AR5K_REG_WRITE_BITS(ah, AR5K_RXCFG,
9                         AR5K_RXCFG_SDMAMW, AR5K_DMASIZE_128B);
10 +#else
11 +               /* WAR for AR71xx PCI bug */
12 +               AR5K_REG_WRITE_BITS(ah, AR5K_RXCFG,
13 +                       AR5K_RXCFG_SDMAMW, AR5K_DMASIZE_4B);
14 +#endif
15         }
16  
17         /* Pre-enable interrupts on 5211/5212*/
18 --- a/drivers/net/wireless/ath/ath5k/initvals.c
19 +++ b/drivers/net/wireless/ath/ath5k/initvals.c
20 @@ -59,7 +59,12 @@ static const struct ath5k_ini ar5210_ini
21         { AR5K_IER,             AR5K_IER_DISABLE },
22         { AR5K_BSR,             0, AR5K_INI_READ },
23         { AR5K_TXCFG,           AR5K_DMASIZE_128B },
24 +#ifndef CONFIG_ATHEROS_AR71XX
25         { AR5K_RXCFG,           AR5K_DMASIZE_128B },
26 +#else
27 +       /* WAR for AR71xx PCI bug */
28 +       { AR5K_RXCFG,           AR5K_DMASIZE_4B },
29 +#endif
30         { AR5K_CFG,             AR5K_INIT_CFG },
31         { AR5K_TOPS,            8 },
32         { AR5K_RXNOFRM,         8 },