wl1271: Retrieve device mac address from the nvs file

Instead of always randomizing the MAC address, retrieve and configure the
MAC address from the device specific nvs file. For now, randomize an address
only if the address in the NVS is zero.

Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: Kalle Valo <kalle.valo@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 0 insertions, 8 deletions

diff --git a/drivers/net/wireless/wl12xx/wl1271_boot.c b/drivers/net/wireless/wl12xx/wl1271_boot.c
index bc3fe0275cac..57ba78d83e87 100644
--- a/drivers/net/wireless/wl12xx/wl1271_boot.c
+++ b/drivers/net/wireless/wl12xx/wl1271_boot.c
@@ -228,14 +228,6 @@ static int wl1271_boot_upload_nvs(struct wl1271 *wl)
         nvs_len = sizeof(wl->nvs->nvs);
         nvs_ptr = (u8 *)wl->nvs->nvs;
 
-        /* Update the device MAC address into the nvs */
-        nvs_ptr[11] = wl->mac_addr[0];
-        nvs_ptr[10] = wl->mac_addr[1];
-        nvs_ptr[6] = wl->mac_addr[2];
-        nvs_ptr[5] = wl->mac_addr[3];
-        nvs_ptr[4] = wl->mac_addr[4];
-        nvs_ptr[3] = wl->mac_addr[5];
-
         /*
          * Layout before the actual NVS tables:
          * 1 byte : burst length.