ath9k: Set RX filter for Probe Request based on filter flag
authorJouni Malinen <jouni.malinen@atheros.com>
Wed, 13 Oct 2010 14:29:31 +0000 (17:29 +0300)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 13 Oct 2010 19:45:23 +0000 (15:45 -0400)
This allows mac80211 to enable receiving of Probe Request frames in
station mode which is needed for P2P.

Signed-off-by: Jouni Malinen <jouni.malinen@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/ath/ath9k/recv.c

index 865649120075b54620e6272e1645d9c066641186..bcd3892dca8d1aca390807d7ec73435d27f14857 100644 (file)
@@ -1739,6 +1739,7 @@ skip_chan_change:
        FIF_PSPOLL |                            \
        FIF_OTHER_BSS |                         \
        FIF_BCN_PRBRESP_PROMISC |               \
+       FIF_PROBE_REQ |                         \
        FIF_FCSFAIL)
 
 /* FIXME: sc->sc_full_reset ? */
index 9c166f3804ab7c9feb3f785e7790c0a825e20017..7c90eaf9ec55cb2409a055850d373ffcd219f93c 100644 (file)
@@ -430,8 +430,7 @@ u32 ath_calcrxfilter(struct ath_softc *sc)
                | ATH9K_RX_FILTER_UCAST | ATH9K_RX_FILTER_BCAST
                | ATH9K_RX_FILTER_MCAST;
 
-       /* If not a STA, enable processing of Probe Requests */
-       if (sc->sc_ah->opmode != NL80211_IFTYPE_STATION)
+       if (sc->rx.rxfilter & FIF_PROBE_REQ)
                rfilt |= ATH9K_RX_FILTER_PROBEREQ;
 
        /*