2013-05-08 09:56:21

by Luciano Coelho

Subject: [PATCH v2] wl18xx: use locally administered MAC address if not available from fuse

In some R&D chips, the device may be left untrimmed and with the MAC
address missing from fuse ROM. In order to support those devices,
apply a random locally administered MAC address instead.

Signed-off-by: Luciano Coelho <[email protected]>
---

In v2:

* use eth_random_addr() to generate the locally assigned address,
instead of hardcoding it. (thanks Johannes)

drivers/net/wireless/ti/wl18xx/main.c | 11 +++++++++++
1 file changed, 11 insertions(+)

diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
index ae85ae4..7aa0eb8 100644
--- a/drivers/net/wireless/ti/wl18xx/main.c
+++ b/drivers/net/wireless/ti/wl18xx/main.c
@@ -23,6 +23,7 @@
#include <linux/platform_device.h>
#include <linux/ip.h>
#include <linux/firmware.h>
+#include <linux/etherdevice.h>

#include "../wlcore/wlcore.h"
#include "../wlcore/debug.h"
@@ -1318,6 +1319,16 @@ static int wl18xx_get_mac(struct wl1271 *wl)
((mac1 & 0xff000000) >> 24);
wl->fuse_nic_addr = (mac1 & 0xffffff);

+ if (!wl->fuse_oui_addr && !wl->fuse_nic_addr) {
+ u8 mac[ETH_ALEN];
+
+ eth_random_addr(mac);
+
+ wl->fuse_oui_addr = (mac[0] << 16) + (mac[1] << 8) + mac[2];
+ wl->fuse_nic_addr = (mac[3] << 16) + (mac[4] << 8) + mac[5];
+ wl1271_warning("MAC address from fuse not available, using random locally administered addresses.");
+ }
+
ret = wlcore_set_partition(wl, &wl->ptable[PART_DOWN]);

out:
--
1.7.10.4

2013-06-17 09:04:38

by Luciano Coelho

Subject: Re: [PATCH v2] wl18xx: use locally administered MAC address if not available from fuse

On Wed, 2013-05-08 at 12:54 +0300, Luciano Coelho wrote:
> In some R&D chips, the device may be left untrimmed and with the MAC
> address missing from fuse ROM. In order to support those devices,
> apply a random locally administered MAC address instead.
>
> Signed-off-by: Luciano Coelho <[email protected]>
> ---
>
> In v2:
>
> * use eth_random_addr() to generate the locally assigned address,
> instead of hardcoding it. (thanks Johannes)

Applied.

--
Luca.