diff options
author | Eliad Peller <eliad@wizery.com> | 2011-10-05 05:55:39 -0400 |
---|---|---|
committer | Luciano Coelho <coelho@ti.com> | 2011-10-07 01:32:31 -0400 |
commit | 784f694d0f3ca927361aa0c26de1aa340eb5b275 (patch) | |
tree | 23d7d89a03be2a1df23e3b97d3b9889fd43e2462 /drivers/net/wireless/wl12xx/wl12xx.h | |
parent | 694440d93b9963a2c426708cb11494236c0b2552 (diff) |
wl12xx: replace wl->mac_addr with vif->addr
The mac address of the interface already exists in vif->addr.
Use it instead of wl->mac_addr.
It seems that due to some fw bug, we still need to set nvs->mac
to the actual mac addresss, otherwise the fw doesn't function
well (e.g. can't get dhcp address).
Thus, use wl->mac_addr for this purpose, and don't delete it yet.
Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl12xx.h')
-rw-r--r-- | drivers/net/wireless/wl12xx/wl12xx.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/wl12xx/wl12xx.h b/drivers/net/wireless/wl12xx/wl12xx.h index 1ec90fc7505e..b8de2f5e052b 100644 --- a/drivers/net/wireless/wl12xx/wl12xx.h +++ b/drivers/net/wireless/wl12xx/wl12xx.h | |||
@@ -507,6 +507,7 @@ struct wl1271 { | |||
507 | u32 mbox_ptr[2]; | 507 | u32 mbox_ptr[2]; |
508 | 508 | ||
509 | /* Are we currently scanning */ | 509 | /* Are we currently scanning */ |
510 | struct ieee80211_vif *scan_vif; | ||
510 | struct wl1271_scan scan; | 511 | struct wl1271_scan scan; |
511 | struct delayed_work scan_complete_work; | 512 | struct delayed_work scan_complete_work; |
512 | 513 | ||