From 02402d304021eb181a8d5194762bbcce3af8f833 Mon Sep 17 00:00:00 2001
From: Lennert Buytenhek <buytenh@wantstofly.org>
Date: Thu, 22 Oct 2009 20:19:53 +0200
Subject: [PATCH] --- yaml --- r: 171391 b: refs/heads/master c:
 77165d8809cda1a77bc8752148a6252d7735c12e h: refs/heads/master i:   171389:
 cb69ff8bff26abc9b4b96e9c5f3f88acec8021e5   171387:
 bab4857e144982d1c25c8f2978bd640afb1d02d1   171383:
 8e1b9b115517010eb231b5433b4bd4104b7c5ac0   171375:
 35b2700772460b8c7405c36a134df9f933c9ee83   171359:
 f57698c7b5857f3fdd6214742e53a21358931338   171327:
 f0bd9d3067d4cf4c49bbdd0db76b9dc22719febe   171263:
 24329e7bb4849d7edb378db371d388adbb67f634 v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/net/wireless/mwl8k.c | 17 ++++++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 691ccc180517..3f00306b7471 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 447ced07d04525218ae586cd70b759b48bcb1fc8
+refs/heads/master: 77165d8809cda1a77bc8752148a6252d7735c12e
diff --git a/trunk/drivers/net/wireless/mwl8k.c b/trunk/drivers/net/wireless/mwl8k.c
index cc58ecba211a..53447f6a0e54 100644
--- a/trunk/drivers/net/wireless/mwl8k.c
+++ b/trunk/drivers/net/wireless/mwl8k.c
@@ -2705,12 +2705,23 @@ static void mwl8k_configure_filter(struct ieee80211_hw *hw,
 		return;
 
 	if (changed_flags & FIF_BCN_PRBRESP_PROMISC) {
-		if (*total_flags & FIF_BCN_PRBRESP_PROMISC)
+		if (*total_flags & FIF_BCN_PRBRESP_PROMISC) {
+			/*
+			 * Disable the BSS filter.
+			 */
 			mwl8k_cmd_set_pre_scan(hw);
-		else {
+		} else {
 			u8 *bssid;
 
-			bssid = "\x00\x00\x00\x00\x00\x00";
+			/*
+			 * Enable the BSS filter.
+			 *
+			 * If there is an active STA interface, use that
+			 * interface's BSSID, otherwise use a dummy one
+			 * (where the OUI part needs to be nonzero for
+			 * the BSSID to be accepted by POST_SCAN).
+			 */
+			bssid = "\x01\x00\x00\x00\x00\x00";
 			if (priv->vif != NULL)
 				bssid = MWL8K_VIF(priv->vif)->bssid;