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

Commit 28c14f4a authored by Hante Meuleman's avatar Hante Meuleman Committed by John W. Linville
Browse files

brcmfmac: Fix rtnl_lock lockup when registering netdev. 



When adding a virtual interface cfg80211 already has taken the
rtnl_lock. So when the netdevice is being registered the
register_netdevice should be used instead of register_netdev.

Reviewed-by: default avatarArend Van Spriel <arend@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: default avatarPiotr Haber <phaber@broadcom.com>
Signed-off-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 7ab6acd0

drivers/net/wireless/brcm80211/brcmfmac/dhd.h

+1 −1
Original line number Diff line number Diff line
@@ -585,7 +585,7 @@ extern int brcmf_proto_cdc_set_dcmd(struct brcmf_pub *drvr, int ifidx, uint cmd, 
extern int brcmf_proto_hdrpull(struct brcmf_pub *drvr, u8 *ifidx,

			       struct sk_buff *rxp);



extern int brcmf_net_attach(struct brcmf_if *ifp);

extern int brcmf_net_attach(struct brcmf_if *ifp, bool rtnl_locked);

extern struct brcmf_if *brcmf_add_if(struct brcmf_pub *drvr, s32 bssidx,

				     s32 ifidx, char *name, u8 *mac_addr);

extern void brcmf_del_if(struct brcmf_pub *drvr, s32 bssidx);

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

+8 −3
Original line number Diff line number Diff line
@@ -599,10 +599,11 @@ static const struct net_device_ops brcmf_netdev_ops_pri = { 
	.ndo_set_rx_mode = brcmf_netdev_set_multicast_list

};



int brcmf_net_attach(struct brcmf_if *ifp)

int brcmf_net_attach(struct brcmf_if *ifp, bool rtnl_locked)

{

	struct brcmf_pub *drvr = ifp->drvr;

	struct net_device *ndev;

	s32 err;



	brcmf_dbg(TRACE, "Enter, idx=%d mac=%pM\n", ifp->bssidx,

		  ifp->mac_addr);
@@ -623,7 +624,11 @@ int brcmf_net_attach(struct brcmf_if *ifp) 
	INIT_WORK(&ifp->setmacaddr_work, _brcmf_set_mac_address);

	INIT_WORK(&ifp->multicast_work, _brcmf_set_multicast_list);



	if (register_netdev(ndev) != 0) {

	if (rtnl_locked)

		err = register_netdevice(ndev);

	else

		err = register_netdev(ndev);

	if (err != 0) {

		brcmf_err("couldn't register the net device\n");

		goto fail;

	}
@@ -876,7 +881,7 @@ int brcmf_bus_start(struct device *dev) 
	if (ret < 0)

		goto fail;



	ret = brcmf_net_attach(ifp);

	ret = brcmf_net_attach(ifp, false);

fail:

	if (ret < 0) {

		brcmf_err("failed: %d\n", ret);

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

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



		if (!drvr->fweh.evt_handler[BRCMF_E_IF])

			err = brcmf_net_attach(ifp);

			err = brcmf_net_attach(ifp, false);

	}



	err = brcmf_fweh_call_event_handler(ifp, emsg->event_code, emsg, data);

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

+1 −1
Original line number Diff line number Diff line
@@ -4668,7 +4668,7 @@ static s32 brcmf_notify_vif_event(struct brcmf_if *ifp, 


		/* waiting process need to set the netdev name */

		wait_for_completion(&event->vif_complete);

		return brcmf_net_attach(ifp);

		return brcmf_net_attach(ifp, true);



	case BRCMF_E_IF_DEL:

		ifp->vif = NULL;