openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

brcm80211: fmac: register primary net device with device mac address 

The primary net device was registered with a primary mac address and
upon IFUP it was set to match the actual mac address from the device.
This patch changes that and moves the brcmf_add_if() call to the common
part of the driver.

Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Arend van Spriel 2012-04-11 11:52:45 +02:00 committed by John W. Linville
parent 3625c149d6
commit 474a64c80e
3 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
View File

@ -1073,6 +1073,11 @@ int brcmf_bus_start(struct device *dev)
if (ret < 0)
return ret;
/* add primary networking interface */
ret = brcmf_add_if(dev, 0, "wlan%d", drvr->mac);
if (ret < 0)
return ret;
/* signal bus ready */
bus_if->state = BRCMF_BUS_DATA;
return 0;

6
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
View File

@ -3948,12 +3948,6 @@ void *brcmf_sdbrcm_probe(u32 regsva, struct brcmf_sdio_dev *sdiodev)
}
}
/* add interface and open for business */
if (brcmf_add_if(bus->sdiodev->dev, 0, "wlan%d", NULL)) {
brcmf_dbg(ERROR, "Add primary net device interface failed!!\n");
goto fail;
}
return bus;
fail:

8
drivers/net/wireless/brcm80211/brcmfmac/usb.c
View File

@ -1383,14 +1383,6 @@ static int brcmf_usb_probe_cb(struct device *dev, const char *desc,
goto fail;
}
/* add interface and open for business */
ret = brcmf_add_if(dev, 0, "wlan%d", NULL);
if (ret) {
brcmf_dbg(ERROR, "Add primary net device interface failed!!\n");
brcmf_detach(dev);
goto fail;
}
return 0;
fail:
/* Release resources in reverse order */