diff options
author | Eliad Peller <eliad@wizery.com> | 2011-02-22 17:27:07 -0500 |
---|---|---|
committer | Luciano Coelho <coelho@ti.com> | 2011-02-23 04:11:20 -0500 |
commit | 6dc9fb3c78a78982f6418b6cf457140f7afa658d (patch) | |
tree | 03dca50c3227cb8995e115c2c05beb7c512fc243 /drivers/net | |
parent | 02ad2d9080266e6d999c00b78610ef6a45be45ea (diff) |
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')
-rw-r--r-- | drivers/net/wireless/wl12xx/acx.c | 3 |
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, | |||
1328 | /* get data from A-MPDU parameters field */ | 1328 | /* get data from A-MPDU parameters field */ |
1329 | acx->ampdu_max_length = ht_cap->ampdu_factor; | 1329 | acx->ampdu_max_length = ht_cap->ampdu_factor; |
1330 | acx->ampdu_min_spacing = ht_cap->ampdu_density; | 1330 | acx->ampdu_min_spacing = ht_cap->ampdu_density; |
1331 | |||
1332 | memcpy(acx->mac_address, mac_address, ETH_ALEN); | ||
1333 | } | 1331 | } |
1334 | 1332 | ||
1333 | memcpy(acx->mac_address, mac_address, ETH_ALEN); | ||
1335 | acx->ht_capabilites = cpu_to_le32(ht_capabilites); | 1334 | acx->ht_capabilites = cpu_to_le32(ht_capabilites); |
1336 | 1335 | ||
1337 | ret = wl1271_cmd_configure(wl, ACX_PEER_HT_CAP, acx, sizeof(*acx)); | 1336 | ret = wl1271_cmd_configure(wl, ACX_PEER_HT_CAP, acx, sizeof(*acx)); |