Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9390ace9 authored by Arend van Spriel's avatar Arend van Spriel Committed by John W. Linville
Browse files

brcmfmac: free net device when registration fails 



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: default avatarHante Meuleman <meuleman@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 24e28bee

drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c

+7 −3
Original line number Diff line number Diff line
@@ -656,7 +656,9 @@ int brcmf_net_attach(struct brcmf_if *ifp, bool rtnl_locked) 
	return 0;



fail:

	drvr->iflist[ifp->bssidx] = NULL;

	ndev->netdev_ops = NULL;

	free_netdev(ndev);

	return -EBADE;

}
@@ -720,6 +722,9 @@ static int brcmf_net_p2p_attach(struct brcmf_if *ifp) 
	return 0;



fail:

	ifp->drvr->iflist[ifp->bssidx] = NULL;

	ndev->netdev_ops = NULL;

	free_netdev(ndev);

	return -EBADE;

}
@@ -925,8 +930,6 @@ fail: 
			brcmf_fws_del_interface(ifp);

			brcmf_fws_deinit(drvr);

		}

		free_netdev(ifp->ndev);

		drvr->iflist[0] = NULL;

		if (p2p_ifp) {

			free_netdev(p2p_ifp->ndev);

			drvr->iflist[1] = NULL;
@@ -934,7 +937,8 @@ fail: 
		return ret;

	}

	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;

}

drivers/net/wireless/brcm80211/brcmfmac/fweh.c

+2 −1
Original line number Diff line number Diff line
@@ -202,7 +202,8 @@ static void brcmf_fweh_handle_if_event(struct brcmf_pub *drvr, 
			return;

		brcmf_fws_add_interface(ifp);

		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)