summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuciano Coelho <luciano.coelho@nokia.com>2009-10-12 16:08:56 +0400
committerJohn W. Linville <linville@tuxdriver.com>2009-10-27 23:48:06 +0300
commit0535d9f4f07df9a592b77fe75f66faee66a851e8 (patch)
tree23816ea1c9455a5de00174732a47b5e818964108
parent8bcfcb125b036e978b1bd478d3f68278b05bcfd6 (diff)
downloadlinux-0535d9f4f07df9a592b77fe75f66faee66a851e8.tar.xz
wl1271: use acx_rx_config instead of join when updating filters
We shouldn't use a join command to change the filter settings while associated. The right way to do it is to use ACX_RX_CFG. Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com> Reviewed-by: Juuso Oikarinen <juuso.oikarinen@nokia.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/wl12xx/wl1271_main.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c
index 5ef0bd53af66..fc0d03fd24cb 100644
--- a/drivers/net/wireless/wl12xx/wl1271_main.c
+++ b/drivers/net/wireless/wl12xx/wl1271_main.c
@@ -422,7 +422,7 @@ static void wl1271_filter_work(struct work_struct *work)
goto out;
/* apply configured filters */
- ret = wl1271_cmd_join(wl);
+ ret = wl1271_acx_rx_config(wl, wl->rx_config, wl->rx_filter);
if (ret < 0)
goto out_sleep;
@@ -869,6 +869,8 @@ static u64 wl1271_op_prepare_multicast(struct ieee80211_hw *hw, int mc_count,
wl1271_warning("Unknown mc address length.");
}
+ /* FIXME: We still need to set our filters properly */
+
spin_lock_irqsave(&wl->wl_lock, flags);
kfree(wl->filter_params);
wl->filter_params = fp;