diff options
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c')
-rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c index c524b04efe5..f603032d3d0 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c | |||
@@ -837,7 +837,8 @@ fail: | |||
837 | } | 837 | } |
838 | 838 | ||
839 | int | 839 | int |
840 | brcmf_add_if(struct device *dev, int ifidx, char *name, u8 *mac_addr) | 840 | brcmf_add_if(struct device *dev, int ifidx, s32 bssidx, |
841 | char *name, u8 *mac_addr) | ||
841 | { | 842 | { |
842 | struct brcmf_if *ifp; | 843 | struct brcmf_if *ifp; |
843 | struct net_device *ndev; | 844 | struct net_device *ndev; |
@@ -872,6 +873,7 @@ brcmf_add_if(struct device *dev, int ifidx, char *name, u8 *mac_addr) | |||
872 | ifp->drvr = drvr; | 873 | ifp->drvr = drvr; |
873 | drvr->iflist[ifidx] = ifp; | 874 | drvr->iflist[ifidx] = ifp; |
874 | ifp->idx = ifidx; | 875 | ifp->idx = ifidx; |
876 | ifp->bssidx = bssidx; | ||
875 | if (mac_addr != NULL) | 877 | if (mac_addr != NULL) |
876 | memcpy(&ifp->mac_addr, mac_addr, ETH_ALEN); | 878 | memcpy(&ifp->mac_addr, mac_addr, ETH_ALEN); |
877 | 879 | ||
@@ -1002,6 +1004,7 @@ int brcmf_bus_start(struct device *dev) | |||
1002 | setbit(drvr->eventmask, BRCMF_E_TXFAIL); | 1004 | setbit(drvr->eventmask, BRCMF_E_TXFAIL); |
1003 | setbit(drvr->eventmask, BRCMF_E_JOIN_START); | 1005 | setbit(drvr->eventmask, BRCMF_E_JOIN_START); |
1004 | setbit(drvr->eventmask, BRCMF_E_SCAN_COMPLETE); | 1006 | setbit(drvr->eventmask, BRCMF_E_SCAN_COMPLETE); |
1007 | setbit(drvr->eventmask, BRCMF_E_IF); | ||
1005 | 1008 | ||
1006 | /* enable dongle roaming event */ | 1009 | /* enable dongle roaming event */ |
1007 | 1010 | ||
@@ -1015,7 +1018,7 @@ int brcmf_bus_start(struct device *dev) | |||
1015 | return ret; | 1018 | return ret; |
1016 | 1019 | ||
1017 | /* add primary networking interface */ | 1020 | /* add primary networking interface */ |
1018 | ret = brcmf_add_if(dev, 0, "wlan%d", drvr->mac); | 1021 | ret = brcmf_add_if(dev, 0, 0, "wlan%d", drvr->mac); |
1019 | if (ret < 0) | 1022 | if (ret < 0) |
1020 | return ret; | 1023 | return ret; |
1021 | 1024 | ||