[backfire] mac80211: revert r29210 for now, it breaks on several architectures
[openwrt-10.03/.git] / package / mac80211 / patches / 552-ath9k_fix_phyerror.patch
1 --- a/drivers/net/wireless/ath/ath9k/recv.c
2 +++ b/drivers/net/wireless/ath/ath9k/recv.c
3 @@ -425,12 +425,9 @@ void ath_rx_cleanup(struct ath_softc *sc
4  
5  u32 ath_calcrxfilter(struct ath_softc *sc)
6  {
7 -#define        RX_FILTER_PRESERVE (ATH9K_RX_FILTER_PHYERR | ATH9K_RX_FILTER_PHYRADAR)
8 -
9         u32 rfilt;
10  
11 -       rfilt = (ath9k_hw_getrxfilter(sc->sc_ah) & RX_FILTER_PRESERVE)
12 -               | ATH9K_RX_FILTER_UCAST | ATH9K_RX_FILTER_BCAST
13 +       rfilt = ATH9K_RX_FILTER_UCAST | ATH9K_RX_FILTER_BCAST
14                 | ATH9K_RX_FILTER_MCAST;
15  
16         if (sc->rx.rxfilter & FIF_PROBE_REQ)
17 --- a/drivers/net/wireless/ath/ath9k/ani.c
18 +++ b/drivers/net/wireless/ath/ath9k/ani.c
19 @@ -502,9 +502,6 @@ static void ath9k_ani_reset_old(struct a
20                 ath9k_hw_ani_control(ah, ATH9K_ANI_CCK_WEAK_SIGNAL_THR,
21                                      ATH9K_ANI_CCK_WEAK_SIG_THR);
22  
23 -               ath9k_hw_setrxfilter(ah, ath9k_hw_getrxfilter(ah) |
24 -                                    ATH9K_RX_FILTER_PHYERR);
25 -
26                 ath9k_ani_restart(ah);
27                 return;
28         }
29 @@ -525,8 +522,6 @@ static void ath9k_ani_reset_old(struct a
30                 ath9k_hw_ani_control(ah, ATH9K_ANI_FIRSTEP_LEVEL,
31                                      aniState->firstepLevel);
32  
33 -       ath9k_hw_setrxfilter(ah, ath9k_hw_getrxfilter(ah) &
34 -                            ~ATH9K_RX_FILTER_PHYERR);
35         ath9k_ani_restart(ah);
36  
37         ENABLE_REGWRITE_BUFFER(ah);