aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/wireless/wl12xx/wl1251_cmd.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1251_cmd.c b/drivers/net/wireless/wl12xx/wl1251_cmd.c
index 6cd024b50a7c..770f260726bd 100644
--- a/drivers/net/wireless/wl12xx/wl1251_cmd.c
+++ b/drivers/net/wireless/wl12xx/wl1251_cmd.c
@@ -276,6 +276,15 @@ int wl1251_cmd_join(struct wl1251 *wl, u8 bss_type, u8 channel,
276 join->rx_config_options = wl->rx_config; 276 join->rx_config_options = wl->rx_config;
277 join->rx_filter_options = wl->rx_filter; 277 join->rx_filter_options = wl->rx_filter;
278 278
279 /*
280 * FIXME: disable temporarily all filters because after commit
281 * 9cef8737 "mac80211: fix managed mode BSSID handling" broke
282 * association. The filter logic needs to be implemented properly
283 * and once that is done, this hack can be removed.
284 */
285 join->rx_config_options = 0;
286 join->rx_filter_options = WL1251_DEFAULT_RX_FILTER;
287
279 join->basic_rate_set = RATE_MASK_1MBPS | RATE_MASK_2MBPS | 288 join->basic_rate_set = RATE_MASK_1MBPS | RATE_MASK_2MBPS |
280 RATE_MASK_5_5MBPS | RATE_MASK_11MBPS; 289 RATE_MASK_5_5MBPS | RATE_MASK_11MBPS;
281 290