Commit 7b21b6f8 authored by Juuso Oikarinen's avatar Juuso Oikarinen Committed by John W. Linville

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: default avatarJuuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: default avatarKalle Valo <kalle.valo@nokia.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 152ee6e0
...@@ -228,14 +228,6 @@ static int wl1271_boot_upload_nvs(struct wl1271 *wl) ...@@ -228,14 +228,6 @@ static int wl1271_boot_upload_nvs(struct wl1271 *wl)
nvs_len = sizeof(wl->nvs->nvs); nvs_len = sizeof(wl->nvs->nvs);
nvs_ptr = (u8 *)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: * Layout before the actual NVS tables:
* 1 byte : burst length. * 1 byte : burst length.
......
...@@ -467,6 +467,32 @@ static int wl1271_fetch_firmware(struct wl1271 *wl) ...@@ -467,6 +467,32 @@ static int wl1271_fetch_firmware(struct wl1271 *wl)
return ret; return ret;
} }
static int wl1271_update_mac_addr(struct wl1271 *wl)
{
int ret = 0;
u8 *nvs_ptr = (u8 *)wl->nvs->nvs;
/* get mac address from the NVS */
wl->mac_addr[0] = nvs_ptr[11];
wl->mac_addr[1] = nvs_ptr[10];
wl->mac_addr[2] = nvs_ptr[6];
wl->mac_addr[3] = nvs_ptr[5];
wl->mac_addr[4] = nvs_ptr[4];
wl->mac_addr[5] = nvs_ptr[3];
/* FIXME: if it is a zero-address, we should bail out. Now, instead,
we randomize an address */
if (is_zero_ether_addr(wl->mac_addr)) {
static const u8 nokia_oui[3] = {0x00, 0x1f, 0xdf};
memcpy(wl->mac_addr, nokia_oui, 3);
get_random_bytes(wl->mac_addr + 3, 3);
}
SET_IEEE80211_PERM_ADDR(wl->hw, wl->mac_addr);
return ret;
}
static int wl1271_fetch_nvs(struct wl1271 *wl) static int wl1271_fetch_nvs(struct wl1271 *wl)
{ {
const struct firmware *fw; const struct firmware *fw;
...@@ -496,7 +522,7 @@ static int wl1271_fetch_nvs(struct wl1271 *wl) ...@@ -496,7 +522,7 @@ static int wl1271_fetch_nvs(struct wl1271 *wl)
memcpy(wl->nvs, fw->data, sizeof(struct wl1271_nvs_file)); memcpy(wl->nvs, fw->data, sizeof(struct wl1271_nvs_file));
ret = 0; ret = wl1271_update_mac_addr(wl);
out: out:
release_firmware(fw); release_firmware(fw);
...@@ -1893,7 +1919,6 @@ static int __devinit wl1271_probe(struct spi_device *spi) ...@@ -1893,7 +1919,6 @@ static int __devinit wl1271_probe(struct spi_device *spi)
struct ieee80211_hw *hw; struct ieee80211_hw *hw;
struct wl1271 *wl; struct wl1271 *wl;
int ret, i; int ret, i;
static const u8 nokia_oui[3] = {0x00, 0x1f, 0xdf};
pdata = spi->dev.platform_data; pdata = spi->dev.platform_data;
if (!pdata) { if (!pdata) {
...@@ -1938,13 +1963,6 @@ static int __devinit wl1271_probe(struct spi_device *spi) ...@@ -1938,13 +1963,6 @@ static int __devinit wl1271_probe(struct spi_device *spi)
spin_lock_init(&wl->wl_lock); spin_lock_init(&wl->wl_lock);
/*
* In case our MAC address is not correctly set,
* we use a random but Nokia MAC.
*/
memcpy(wl->mac_addr, nokia_oui, 3);
get_random_bytes(wl->mac_addr + 3, 3);
wl->state = WL1271_STATE_OFF; wl->state = WL1271_STATE_OFF;
mutex_init(&wl->mutex); mutex_init(&wl->mutex);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment