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

Commit ee6e3a34 authored by Arend van Spriel's avatar Arend van Spriel Committed by Kalle Valo
Browse files

brcmfmac: change parameters for brcmf_remove_interface() 



Just pass the interface to be removed, ie. the struct brcmf_if instance.

Reviewed-by: default avatarHante Meuleman <meuleman@broadcom.com>
Reviewed-by: default avatarFranky (Zhenhui) Lin <frankyl@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 796cfb65

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

+1 −1
Original line number Diff line number Diff line
@@ -4983,7 +4983,7 @@ brcmf_notify_connect_status_ap(struct brcmf_cfg80211_info *cfg, 
		brcmf_dbg(CONN, "AP mode link down\n");

		complete(&cfg->vif_disabled);

		if (ifp->vif->mbss)

			brcmf_remove_interface(ifp->drvr, ifp->bssidx);

			brcmf_remove_interface(ifp);

		return 0;

	}

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

+7 −6
Original line number Diff line number Diff line
@@ -887,12 +887,13 @@ static void brcmf_del_if(struct brcmf_pub *drvr, s32 bssidx) 
	}

}



void brcmf_remove_interface(struct brcmf_pub *drvr, u32 bssidx)

void brcmf_remove_interface(struct brcmf_if *ifp)

{

	if (drvr->iflist[bssidx]) {

		brcmf_fws_del_interface(drvr->iflist[bssidx]);

		brcmf_del_if(drvr, bssidx);

	}

	if (!ifp || WARN_ON(ifp->drvr->iflist[ifp->bssidx] != ifp))

		return;



	brcmf_fws_del_interface(ifp);

	brcmf_del_if(ifp->drvr, ifp->bssidx);

}



int brcmf_get_next_free_bsscfgidx(struct brcmf_pub *drvr)
@@ -1122,7 +1123,7 @@ void brcmf_detach(struct device *dev) 


	/* make sure primary interface removed last */

	for (i = BRCMF_MAX_IFS-1; i > -1; i--)

		brcmf_remove_interface(drvr, i);

		brcmf_remove_interface(drvr->iflist[i]);



	brcmf_cfg80211_detach(drvr->config);

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

+1 −1
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ struct brcmf_if *brcmf_get_ifp(struct brcmf_pub *drvr, int ifidx); 
int brcmf_net_attach(struct brcmf_if *ifp, bool rtnl_locked);

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

			      char *name, u8 *mac_addr);

void brcmf_remove_interface(struct brcmf_pub *drvr, u32 bssidx);

void brcmf_remove_interface(struct brcmf_if *ifp);

int brcmf_get_next_free_bsscfgidx(struct brcmf_pub *drvr);

void brcmf_txflowblock_if(struct brcmf_if *ifp,

			  enum brcmf_netif_stop_reason reason, bool state);

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

+1 −1
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ static void brcmf_fweh_handle_if_event(struct brcmf_pub *drvr, 
	err = brcmf_fweh_call_event_handler(ifp, emsg->event_code, emsg, data);



	if (ifp && ifevent->action == BRCMF_E_IF_DEL)

		brcmf_remove_interface(drvr, ifevent->bssidx);

		brcmf_remove_interface(ifp);

}



/**

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

+1 −1
Original line number Diff line number Diff line
@@ -2140,7 +2140,7 @@ static void brcmf_p2p_delete_p2pdev(struct brcmf_p2p_info *p2p, 
{

	cfg80211_unregister_wdev(&vif->wdev);

	p2p->bss_idx[P2PAPI_BSSCFG_DEVICE].vif = NULL;

	brcmf_remove_interface(vif->ifp->drvr, vif->ifp->bssidx);

	brcmf_remove_interface(vif->ifp);

	brcmf_free_vif(vif);

}