From 3e6cf3f3a513a476e1b2538805712f04746e3c9a Mon Sep 17 00:00:00 2001
From: Grazvydas Ignotas <notasas@gmail.com>
Date: Sat, 16 Jun 2012 22:31:49 +0300
Subject: [PATCH] --- yaml --- r: 314790 b: refs/heads/master c:
 a2d2bb8675fe9dc127d802b6be6517a0932e65b7 h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/net/wireless/ti/wl1251/cmd.c  | 9 ---------
 trunk/drivers/net/wireless/ti/wl1251/main.c | 6 ++++++
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 3576664d3c00..92911ee2b7d0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e05bedca084faa073c2e64bbcd6407dbaff3151
+refs/heads/master: a2d2bb8675fe9dc127d802b6be6517a0932e65b7
diff --git a/trunk/drivers/net/wireless/ti/wl1251/cmd.c b/trunk/drivers/net/wireless/ti/wl1251/cmd.c
index d14d69d733a0..6822b845efc1 100644
--- a/trunk/drivers/net/wireless/ti/wl1251/cmd.c
+++ b/trunk/drivers/net/wireless/ti/wl1251/cmd.c
@@ -277,15 +277,6 @@ int wl1251_cmd_join(struct wl1251 *wl, u8 bss_type, u8 channel,
 	join->rx_config_options = wl->rx_config;
 	join->rx_filter_options = wl->rx_filter;
 
-	/*
-	 * FIXME: disable temporarily all filters because after commit
-	 * 9cef8737 "mac80211: fix managed mode BSSID handling" broke
-	 * association. The filter logic needs to be implemented properly
-	 * and once that is done, this hack can be removed.
-	 */
-	join->rx_config_options = 0;
-	join->rx_filter_options = WL1251_DEFAULT_RX_FILTER;
-
 	join->basic_rate_set = RATE_MASK_1MBPS | RATE_MASK_2MBPS |
 		RATE_MASK_5_5MBPS | RATE_MASK_11MBPS;
 
diff --git a/trunk/drivers/net/wireless/ti/wl1251/main.c b/trunk/drivers/net/wireless/ti/wl1251/main.c
index ff60a7a341be..6094e3f9e2f8 100644
--- a/trunk/drivers/net/wireless/ti/wl1251/main.c
+++ b/trunk/drivers/net/wireless/ti/wl1251/main.c
@@ -334,6 +334,12 @@ static int wl1251_join(struct wl1251 *wl, u8 bss_type, u8 channel,
 	if (ret < 0)
 		goto out;
 
+	/*
+	 * Join command applies filters, and if we are not associated,
+	 * BSSID filter must be disabled for association to work.
+	 */
+	if (is_zero_ether_addr(wl->bssid))
+		wl->rx_config &= ~CFG_BSSID_FILTER_EN;
 
 	ret = wl1251_cmd_join(wl, bss_type, channel, beacon_interval,
 			      dtim_period);