ath9k: Filter out beacons from other BSS in STA mode

Passing beacons received from other BSS to s/w in non-scanning
state is unnecessary in STA mode. This patch filters them out in
h/w.

Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/ath9k/mac.h b/drivers/net/wireless/ath9k/mac.h
index 74b660ae8add970f9f1031cb1350a9035ccf9b58..862a63f7634b1001a14a0f594b33a1f7c880df5e 100644 (file)
--- a/drivers/net/wireless/ath9k/mac.h
+++ b/drivers/net/wireless/ath9k/mac.h
@@ -566,8 +566,9 @@ enum ath9k_rx_filter {
        ATH9K_RX_FILTER_BEACON = 0x00000010,
        ATH9K_RX_FILTER_PROM = 0x00000020,
        ATH9K_RX_FILTER_PROBEREQ = 0x00000080,
-       ATH9K_RX_FILTER_PSPOLL = 0x00004000,
        ATH9K_RX_FILTER_PHYERR = 0x00000100,
+       ATH9K_RX_FILTER_MYBEACON = 0x00000200,
+       ATH9K_RX_FILTER_PSPOLL = 0x00004000,
        ATH9K_RX_FILTER_PHYRADAR = 0x00002000,
 };
 

diff --git a/drivers/net/wireless/ath9k/recv.c b/drivers/net/wireless/ath9k/recv.c
index 28ad1d5af129aec5cc42e1ece1265393db06699e..23b6f54cde5cb7360d034fa54b47eabb0a651501 100644 (file)
--- a/drivers/net/wireless/ath9k/recv.c
+++ b/drivers/net/wireless/ath9k/recv.c
@@ -375,14 +375,15 @@ u32 ath_calcrxfilter(struct ath_softc *sc)
        if (sc->rx.rxfilter & FIF_CONTROL)
                rfilt |= ATH9K_RX_FILTER_CONTROL;
 
-       if (sc->sc_ah->opmode == NL80211_IFTYPE_STATION ||
-           sc->sc_ah->opmode == NL80211_IFTYPE_ADHOC)
+       if ((sc->sc_ah->opmode == NL80211_IFTYPE_STATION) &&
+           !(sc->rx.rxfilter & FIF_BCN_PRBRESP_PROMISC))
+               rfilt |= ATH9K_RX_FILTER_MYBEACON;
+       else
                rfilt |= ATH9K_RX_FILTER_BEACON;
 
-       /* If in HOSTAP mode, want to enable reception of PSPOLL frames
-          & beacon frames */
+       /* If in HOSTAP mode, want to enable reception of PSPOLL frames */
        if (sc->sc_ah->opmode == NL80211_IFTYPE_AP)
-               rfilt |= (ATH9K_RX_FILTER_BEACON | ATH9K_RX_FILTER_PSPOLL);
+               rfilt |= ATH9K_RX_FILTER_PSPOLL;
 
        return rfilt;