From 80c468627310a16660004bd554f7f1e182b5d017 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Wed, 13 Oct 2010 17:29:31 +0300 Subject: [PATCH] --- yaml --- r: 215338 b: refs/heads/master c: 9c1d8e4affe6748d884a677cf5db19ae0c20ef07 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath9k/main.c | 1 + trunk/drivers/net/wireless/ath/ath9k/recv.c | 3 +-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a704d7ab00b6..89dedbcfd8af 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7be5086d4cb7cceb71d724a9524d5e927785d04f +refs/heads/master: 9c1d8e4affe6748d884a677cf5db19ae0c20ef07 diff --git a/trunk/drivers/net/wireless/ath/ath9k/main.c b/trunk/drivers/net/wireless/ath/ath9k/main.c index 865649120075..bcd3892dca8d 100644 --- a/trunk/drivers/net/wireless/ath/ath9k/main.c +++ b/trunk/drivers/net/wireless/ath/ath9k/main.c @@ -1739,6 +1739,7 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed) FIF_PSPOLL | \ FIF_OTHER_BSS | \ FIF_BCN_PRBRESP_PROMISC | \ + FIF_PROBE_REQ | \ FIF_FCSFAIL) /* FIXME: sc->sc_full_reset ? */ diff --git a/trunk/drivers/net/wireless/ath/ath9k/recv.c b/trunk/drivers/net/wireless/ath/ath9k/recv.c index 9c166f3804ab..7c90eaf9ec55 100644 --- a/trunk/drivers/net/wireless/ath/ath9k/recv.c +++ b/trunk/drivers/net/wireless/ath/ath9k/recv.c @@ -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; /*