ath9k: enable RXing of beacons on STA/IBSS

commit ffb826767bffda61426d964a8fc24a216a14b0bd upstream.

This enables beacons to come through on STA/IBSS.
It should fix sporadic connection issues. Right now
mac80211 expect beacons so give it beacons.

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/net/wireless/ath9k/recv.c b/drivers/net/wireless/ath9k/recv.c
index 504a0444d89f853672a4abd71886cc17e3068ff9..b9b36cbc6b8d89a5f6fdd596afa7c714b0398159 100644 (file)
--- a/drivers/net/wireless/ath9k/recv.c
+++ b/drivers/net/wireless/ath9k/recv.c
@@ -627,9 +627,8 @@ u32 ath_calcrxfilter(struct ath_softc *sc)
                rfilt &= ~ATH9K_RX_FILTER_UCAST;
        }
 
-       if (((sc->sc_ah->ah_opmode == ATH9K_M_STA) &&
-            (sc->rx_filter & FIF_BCN_PRBRESP_PROMISC)) ||
-           (sc->sc_ah->ah_opmode == ATH9K_M_IBSS))
+       if (sc->sc_ah->ah_opmode == ATH9K_M_STA ||
+                       sc->sc_ah->ah_opmode == ATH9K_M_IBSS)
                rfilt |= ATH9K_RX_FILTER_BEACON;
 
        /* If in HOSTAP mode, want to enable reception of PSPOLL frames