diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_main.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c index 864503048257..4a2f1d772adc 100644 --- a/drivers/net/wireless/wl12xx/wl1271_main.c +++ b/drivers/net/wireless/wl12xx/wl1271_main.c | |||
@@ -2143,7 +2143,6 @@ struct ieee80211_hw *wl1271_alloc_hw(void) | |||
2143 | struct platform_device *plat_dev = NULL; | 2143 | struct platform_device *plat_dev = NULL; |
2144 | struct wl1271 *wl; | 2144 | struct wl1271 *wl; |
2145 | int i, ret; | 2145 | int i, ret; |
2146 | static const u8 nokia_oui[3] = {0x00, 0x1f, 0xdf}; | ||
2147 | 2146 | ||
2148 | hw = ieee80211_alloc_hw(sizeof(*wl), &wl1271_ops); | 2147 | hw = ieee80211_alloc_hw(sizeof(*wl), &wl1271_ops); |
2149 | if (!hw) { | 2148 | if (!hw) { |
@@ -2195,13 +2194,6 @@ struct ieee80211_hw *wl1271_alloc_hw(void) | |||
2195 | wl->state = WL1271_STATE_OFF; | 2194 | wl->state = WL1271_STATE_OFF; |
2196 | mutex_init(&wl->mutex); | 2195 | mutex_init(&wl->mutex); |
2197 | 2196 | ||
2198 | /* | ||
2199 | * FIXME: we should use a zero MAC address here, but for now we | ||
2200 | * generate a random Nokia address. | ||
2201 | */ | ||
2202 | memcpy(wl->mac_addr, nokia_oui, 3); | ||
2203 | get_random_bytes(wl->mac_addr + 3, 3); | ||
2204 | |||
2205 | /* Apply default driver configuration. */ | 2197 | /* Apply default driver configuration. */ |
2206 | wl1271_conf_init(wl); | 2198 | wl1271_conf_init(wl); |
2207 | 2199 | ||