leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

brcmfmac: free net device when registration fails

Browse Source 
When registration fails the net device is no longer needed. Free
the net device and remove reference to private data from the
driver.

Reviewed-by: Hante Meuleman <meuleman@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 2013-05-27 21:09:56 +02:00 committed by John W. Linville
parent 24e28beef9
commit 9390ace916
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -656,7 +656,9 @@ int brcmf_net_attach(struct brcmf_if *ifp, bool rtnl_locked)
return 0; return 0;
fail: fail:
drvr->iflist[ifp->bssidx] = NULL;
ndev->netdev_ops = NULL; ndev->netdev_ops = NULL;
free_netdev(ndev);
return -EBADE; return -EBADE;
} }
@ -720,6 +722,9 @@ static int brcmf_net_p2p_attach(struct brcmf_if *ifp)
return 0; return 0;
fail: fail:
ifp->drvr->iflist[ifp->bssidx] = NULL;
ndev->netdev_ops = NULL;
free_netdev(ndev);
return -EBADE; return -EBADE;
} }
@ -925,8 +930,6 @@ fail:
brcmf_fws_del_interface(ifp); brcmf_fws_del_interface(ifp);
brcmf_fws_deinit(drvr); brcmf_fws_deinit(drvr);
} }
free_netdev(ifp->ndev);
drvr->iflist[0] = NULL;
if (p2p_ifp) { if (p2p_ifp) {
free_netdev(p2p_ifp->ndev); free_netdev(p2p_ifp->ndev);
drvr->iflist[1] = NULL; drvr->iflist[1] = NULL;
@ -934,7 +937,8 @@ fail:
return ret; return ret;
} }
if ((brcmf_p2p_enable) && (p2p_ifp)) if ((brcmf_p2p_enable) && (p2p_ifp))
brcmf_net_p2p_attach(p2p_ifp); if (brcmf_net_p2p_attach(p2p_ifp) < 0)
brcmf_p2p_enable = 0;
return 0; return 0;
} }

3
drivers/net/wireless/brcm80211/brcmfmac/fweh.c
View File

@ -202,7 +202,8 @@ static void brcmf_fweh_handle_if_event(struct brcmf_pub *drvr,
return; return;
brcmf_fws_add_interface(ifp); brcmf_fws_add_interface(ifp);
if (!drvr->fweh.evt_handler[BRCMF_E_IF]) if (!drvr->fweh.evt_handler[BRCMF_E_IF])
err = brcmf_net_attach(ifp, false); if (brcmf_net_attach(ifp, false) < 0)
return;
} }
if (ifevent->action == BRCMF_E_IF_CHANGE) if (ifevent->action == BRCMF_E_IF_CHANGE)