From: Eliad Peller Date: Tue, 22 Feb 2011 22:27:07 +0000 (+0200) Subject: wl12xx: always set mac_address when configuring ht caps X-Git-Tag: v2.6.39-rc1~468^2~158^2^2~69^2~8 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=6dc9fb3c78a78982f6418b6cf457140f7afa658d;p=~shefty%2Frdma-dev.git 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 Signed-off-by: Luciano Coelho --- diff --git a/drivers/net/wireless/wl12xx/acx.c b/drivers/net/wireless/wl12xx/acx.c index 33840d95d17..6d5312990f7 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));