From 3eeba2eecc9e899c3f3284c51bcbe894ef852798 Mon Sep 17 00:00:00 2001
From: Lennert Buytenhek <buytenh@wantstofly.org>
Date: Thu, 22 Oct 2009 20:21:36 +0200
Subject: [PATCH] --- yaml --- r: 171459 b: refs/heads/master c:
 c0adae2caa1a152c6ec691c5d1e815e47dac2a0c h: refs/heads/master i:   171457:
 c88b0abb52a02c782b4304055771eb97c697b1a5   171455:
 91a3ce812c255f123908509c3444bfa9cfeb7a7b v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/net/wireless/mwl8k.c | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1479d6ad4da0..cda644e303d9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 08b063477e45cb366df7204cbcdc79ff86513ef9
+refs/heads/master: c0adae2caa1a152c6ec691c5d1e815e47dac2a0c
diff --git a/trunk/drivers/net/wireless/mwl8k.c b/trunk/drivers/net/wireless/mwl8k.c
index 59219fdb342d..19c6bea1bc48 100644
--- a/trunk/drivers/net/wireless/mwl8k.c
+++ b/trunk/drivers/net/wireless/mwl8k.c
@@ -3013,6 +3013,16 @@ static void mwl8k_configure_filter(struct ieee80211_hw *hw,
 	struct mwl8k_priv *priv = hw->priv;
 	struct mwl8k_cmd_pkt *cmd = (void *)(unsigned long)multicast;
 
+	/*
+	 * AP firmware doesn't allow fine-grained control over
+	 * the receive filter.
+	 */
+	if (priv->ap_fw) {
+		*total_flags &= FIF_ALLMULTI | FIF_BCN_PRBRESP_PROMISC;
+		kfree(cmd);
+		return;
+	}
+
 	/*
 	 * Enable hardware sniffer mode if FIF_CONTROL or
 	 * FIF_OTHER_BSS is requested.