]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Revert "ath5k: honor FIF_BCN_PRBRESP_PROMISC in STA mode"
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 6 Nov 2008 20:49:04 +0000 (15:49 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 6 Nov 2008 21:36:38 +0000 (16:36 -0500)
Unfortunately, the result was that mac80211 didn't see all the beacons
it actually wanted to see.  This caused lost associations.

Hopefully we can revisit this when mac80211 is less greedy about seeing
beacons directly...

This reverts commit 063279062a8c530cc90fb77797db16c49c905b26.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath5k/base.c

index 9e47d727e2206ff28c647f648bb29caf4888057d..cfd4d052d666ea8cbda45b37c541cb2592dad3a0 100644 (file)
@@ -2942,8 +2942,10 @@ static void ath5k_configure_filter(struct ieee80211_hw *hw,
                sc->opmode != NL80211_IFTYPE_MESH_POINT &&
                test_bit(ATH_STAT_PROMISC, sc->status))
                rfilt |= AR5K_RX_FILTER_PROM;
-       if (sc->opmode == NL80211_IFTYPE_ADHOC)
+       if (sc->opmode == NL80211_IFTYPE_STATION ||
+               sc->opmode == NL80211_IFTYPE_ADHOC) {
                rfilt |= AR5K_RX_FILTER_BEACON;
+       }
 
        /* Set filters */
        ath5k_hw_set_rx_filter(ah,rfilt);