aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/wl12xx/cmd.c
diff options
context:
space:
mode:
authorEliad Peller <eliad@wizery.com>2011-02-02 09:59:37 +0200
committerLuciano Coelho <coelho@ti.com>2011-02-08 22:51:42 -0200
commit72c2d9e511846a4f2759389b38ed8a5553579eb3 (patch)
treef0329c44ea13a81a1f69b6bd92e203e720ee6b8f /drivers/net/wireless/wl12xx/cmd.c
parentfe5ef090660de340b52823de7cb65b899bb4f012 (diff)
downloadkernel_samsung_smdk4412-72c2d9e511846a4f2759389b38ed8a5553579eb3.zip
kernel_samsung_smdk4412-72c2d9e511846a4f2759389b38ed8a5553579eb3.tar.gz
kernel_samsung_smdk4412-72c2d9e511846a4f2759389b38ed8a5553579eb3.tar.bz2
wl12xx: set supported_rates after association
Instead of looking for supported_rates change on every tx packet, just extract the supported_rates after association completes (station only). Remove wl1271.sta_rate_set and WL1271_FLAG_STA_RATES_CHANGED which are not used anymore. Signed-off-by: Eliad Peller <eliad@wizery.com> Reviewed-by: Juuso Oikarinen <juuso.oikarinen@nokia.com> Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/cmd.c')
-rw-r--r--drivers/net/wireless/wl12xx/cmd.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/net/wireless/wl12xx/cmd.c b/drivers/net/wireless/wl12xx/cmd.c
index 66d15e7..97ffd7a 100644
--- a/drivers/net/wireless/wl12xx/cmd.c
+++ b/drivers/net/wireless/wl12xx/cmd.c
@@ -286,13 +286,7 @@ int wl1271_cmd_join(struct wl1271 *wl, u8 bss_type)
join->rx_filter_options = cpu_to_le32(wl->rx_filter);
join->bss_type = bss_type;
join->basic_rate_set = cpu_to_le32(wl->basic_rate_set);
- /*
- * for supported_rate_set, we should use wl->rate_set. however,
- * it seems that acx_rate_policies doesn't affect full_rate, and
- * since we want to avoid additional join, we'll use a 0xffffffff value,
- * and let the fw find the actual supported rates
- */
- join->supported_rate_set = cpu_to_le32(0xffffffff);
+ join->supported_rate_set = cpu_to_le32(wl->rate_set);
if (wl->band == IEEE80211_BAND_5GHZ)
join->bss_type |= WL1271_JOIN_CMD_BSS_TYPE_5GHZ;
@@ -310,6 +304,9 @@ int wl1271_cmd_join(struct wl1271 *wl, u8 bss_type)
wl->tx_security_last_seq = 0;
wl->tx_security_seq = 0;
+ wl1271_debug(DEBUG_CMD, "cmd join: basic_rate_set=0x%x, rate_set=0x%x",
+ join->basic_rate_set, join->supported_rate_set);
+
ret = wl1271_cmd_send(wl, CMD_START_JOIN, join, sizeof(*join), 0);
if (ret < 0) {
wl1271_error("failed to initiate cmd join");