Skip to content

Commit

Permalink
wl1271: Remove device MAC-address randomization
Browse files Browse the repository at this point in the history
This patch removes the MAC address randomization from the driver. This removes
a nasty Nokia-OUI dependency from the driver.

With this patch, unless an address is explicitly configured to the driver
by the user, only a zero address will be configured, and the driver will be
unable to start.

Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: Teemu Paasikivi <ext-teemu.3.paasikivi@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Juuso Oikarinen authored and John W. Linville committed Mar 31, 2010
1 parent 259da43 commit 9560134
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions drivers/net/wireless/wl12xx/wl1271_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -2143,7 +2143,6 @@ struct ieee80211_hw *wl1271_alloc_hw(void)
struct platform_device *plat_dev = NULL;
struct wl1271 *wl;
int i, ret;
static const u8 nokia_oui[3] = {0x00, 0x1f, 0xdf};

hw = ieee80211_alloc_hw(sizeof(*wl), &wl1271_ops);
if (!hw) {
Expand Down Expand Up @@ -2195,13 +2194,6 @@ struct ieee80211_hw *wl1271_alloc_hw(void)
wl->state = WL1271_STATE_OFF;
mutex_init(&wl->mutex);

/*
* FIXME: we should use a zero MAC address here, but for now we
* generate a random Nokia address.
*/
memcpy(wl->mac_addr, nokia_oui, 3);
get_random_bytes(wl->mac_addr + 3, 3);

/* Apply default driver configuration. */
wl1271_conf_init(wl);

Expand Down

0 comments on commit 9560134

Please sign in to comment.