From ec842c82ed2cb8d1285f173bd1d317c8e427cfc5 Mon Sep 17 00:00:00 2001
From: Jouni Malinen <jouni.malinen@atheros.com>
Date: Tue, 3 Mar 2009 19:23:30 +0200
Subject: [PATCH] --- yaml --- r: 135103 b: refs/heads/master c:
 b93bce2a5e8fd5c9f5d8c982efd6bca71a9b83f3 h: refs/heads/master i:   135101:
 e5d9803b7f758d278c7f0a83d8de8f0636647b29   135099:
 cf14dace6d627d1eefe58c4dc3546cbc1d3fbb7a   135095:
 3579ab25e053229c8ec5be2ebc9f62df3dbe3aed   135087:
 abd46f999273350428e7a419f47691c9376fed1f   135071:
 2772d751b4fe5e8062cc84dca1fb156aa48250cb   135039:
 a1faa895b3f15f122214fdfc7fae0813836cf65c v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/net/wireless/ath9k/mac.h  | 1 +
 trunk/drivers/net/wireless/ath9k/recv.c | 8 ++++++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2e43ed21caac..3c7c44922850 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c52f33d05e5f8d59f02722fbc308f5f391575ca5
+refs/heads/master: b93bce2a5e8fd5c9f5d8c982efd6bca71a9b83f3
diff --git a/trunk/drivers/net/wireless/ath9k/mac.h b/trunk/drivers/net/wireless/ath9k/mac.h
index fbd2d6ad2a53..37e3948ddc25 100644
--- a/trunk/drivers/net/wireless/ath9k/mac.h
+++ b/trunk/drivers/net/wireless/ath9k/mac.h
@@ -570,6 +570,7 @@ enum ath9k_rx_filter {
 	ATH9K_RX_FILTER_MYBEACON = 0x00000200,
 	ATH9K_RX_FILTER_PSPOLL = 0x00004000,
 	ATH9K_RX_FILTER_PHYRADAR = 0x00002000,
+	ATH9K_RX_FILTER_MCAST_BCAST_ALL = 0x00008000,
 };
 
 #define ATH9K_RATESERIES_RTS_CTS  0x0001
diff --git a/trunk/drivers/net/wireless/ath9k/recv.c b/trunk/drivers/net/wireless/ath9k/recv.c
index a9a55df500a4..3df5c7824360 100644
--- a/trunk/drivers/net/wireless/ath9k/recv.c
+++ b/trunk/drivers/net/wireless/ath9k/recv.c
@@ -407,6 +407,14 @@ u32 ath_calcrxfilter(struct ath_softc *sc)
 	if (sc->sc_ah->opmode == NL80211_IFTYPE_AP)
 		rfilt |= ATH9K_RX_FILTER_PSPOLL;
 
+	if (sc->sec_wiphy) {
+		/* TODO: only needed if more than one BSSID is in use in
+		 * station/adhoc mode */
+		/* TODO: for older chips, may need to add ATH9K_RX_FILTER_PROM
+		 */
+		rfilt |= ATH9K_RX_FILTER_MCAST_BCAST_ALL;
+	}
+
 	return rfilt;
 
 #undef RX_FILTER_PRESERVE