wl12xx: always set mac_address when configuring ht caps
authorEliad Peller <eliad@wizery.com>
Tue, 22 Feb 2011 22:27:07 +0000 (00:27 +0200)
committerLuciano Coelho <coelho@ti.com>
Wed, 23 Feb 2011 09:11:20 +0000 (11:11 +0200)
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>
drivers/net/wireless/wl12xx/acx.c

index 33840d9..6d53129 100644 (file)
@@ -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));