summaryrefslogtreecommitdiff
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorEliad Peller <eliad@wizery.com>2011-02-23 01:27:07 +0300
committerLuciano Coelho <coelho@ti.com>2011-02-23 12:11:20 +0300
commit6dc9fb3c78a78982f6418b6cf457140f7afa658d (patch)
tree03dca50c3227cb8995e115c2c05beb7c512fc243 /drivers/net/wireless
parent02ad2d9080266e6d999c00b78610ef6a45be45ea (diff)
downloadlinux-6dc9fb3c78a78982f6418b6cf457140f7afa658d.tar.xz
wl12xx: always set mac_address when configuring ht caps
The mac_address should be set also when ht caps are disabled. Signed-off-by: Eliad Peller <eliad@wizery.com> Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/wl12xx/acx.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/wl12xx/acx.c b/drivers/net/wireless/wl12xx/acx.c
index 33840d95d17d..6d5312990f79 100644
--- a/drivers/net/wireless/wl12xx/acx.c
+++ b/drivers/net/wireless/wl12xx/acx.c
@@ -1328,10 +1328,9 @@ int wl1271_acx_set_ht_capabilities(struct wl1271 *wl,
/* get data from A-MPDU parameters field */
acx->ampdu_max_length = ht_cap->ampdu_factor;
acx->ampdu_min_spacing = ht_cap->ampdu_density;
-
- memcpy(acx->mac_address, mac_address, ETH_ALEN);
}
+ memcpy(acx->mac_address, mac_address, ETH_ALEN);
acx->ht_capabilites = cpu_to_le32(ht_capabilites);
ret = wl1271_cmd_configure(wl, ACX_PEER_HT_CAP, acx, sizeof(*acx));