From 9cd5b2aee6cacf5bcac591e0382e2be99752921c Mon Sep 17 00:00:00 2001 From: Luciano Coelho Date: Thu, 8 Oct 2009 21:56:28 +0300 Subject: [PATCH] --- yaml --- r: 170913 b: refs/heads/master c: 64a7f67287c75f5bb28018a6ff2750a59ee1195a h: refs/heads/master i: 170911: 3653ad8a623e53d13d26e05fece11b1b7287a436 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/wl12xx/wl1271_cmd.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 46da1a4acad2..037f0751976d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2f0187250041afc765df51e2cce653e8a5b9c1b6 +refs/heads/master: 64a7f67287c75f5bb28018a6ff2750a59ee1195a diff --git a/trunk/drivers/net/wireless/wl12xx/wl1271_cmd.c b/trunk/drivers/net/wireless/wl12xx/wl1271_cmd.c index 35a6e67f7ae4..ac93efd53f2a 100644 --- a/trunk/drivers/net/wireless/wl12xx/wl1271_cmd.c +++ b/trunk/drivers/net/wireless/wl12xx/wl1271_cmd.c @@ -208,6 +208,15 @@ int wl1271_cmd_join(struct wl1271 *wl) 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 = WL1271_DEFAULT_RX_FILTER; + join->basic_rate_set = RATE_MASK_1MBPS | RATE_MASK_2MBPS | RATE_MASK_5_5MBPS | RATE_MASK_11MBPS;