mac80211: update to 2011-11-15 from trunk

[openwrt-10.03/.git] / package / mac80211 / patches / 552-ath9k_fix_phyerror.patch

diff --git a/package/mac80211/patches/552-ath9k_fix_phyerror.patch b/package/mac80211/patches/552-ath9k_fix_phyerror.patch
deleted file mode 100644 (file)
index 3ef090e..0000000
--- a/package/mac80211/patches/552-ath9k_fix_phyerror.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/drivers/net/wireless/ath/ath9k/recv.c
-+++ b/drivers/net/wireless/ath/ath9k/recv.c
-@@ -425,12 +425,9 @@ void ath_rx_cleanup(struct ath_softc *sc
- 
- u32 ath_calcrxfilter(struct ath_softc *sc)
- {
--#define       RX_FILTER_PRESERVE (ATH9K_RX_FILTER_PHYERR | ATH9K_RX_FILTER_PHYRADAR)
--
-       u32 rfilt;
- 
--      rfilt = (ath9k_hw_getrxfilter(sc->sc_ah) & RX_FILTER_PRESERVE)
--              | ATH9K_RX_FILTER_UCAST | ATH9K_RX_FILTER_BCAST
-+      rfilt = ATH9K_RX_FILTER_UCAST | ATH9K_RX_FILTER_BCAST
-               | ATH9K_RX_FILTER_MCAST;
- 
-       if (sc->rx.rxfilter & FIF_PROBE_REQ)
---- a/drivers/net/wireless/ath/ath9k/ani.c
-+++ b/drivers/net/wireless/ath/ath9k/ani.c
-@@ -502,9 +502,6 @@ static void ath9k_ani_reset_old(struct a
-               ath9k_hw_ani_control(ah, ATH9K_ANI_CCK_WEAK_SIGNAL_THR,
-                                    ATH9K_ANI_CCK_WEAK_SIG_THR);
- 
--              ath9k_hw_setrxfilter(ah, ath9k_hw_getrxfilter(ah) |
--                                   ATH9K_RX_FILTER_PHYERR);
--
-               ath9k_ani_restart(ah);
-               return;
-       }
-@@ -525,8 +522,6 @@ static void ath9k_ani_reset_old(struct a
-               ath9k_hw_ani_control(ah, ATH9K_ANI_FIRSTEP_LEVEL,
-                                    aniState->firstepLevel);
- 
--      ath9k_hw_setrxfilter(ah, ath9k_hw_getrxfilter(ah) &
--                           ~ATH9K_RX_FILTER_PHYERR);
-       ath9k_ani_restart(ah);
- 
-       ENABLE_REGWRITE_BUFFER(ah);