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

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

brcmfmac: free ifp for non-netdev interface in p2p module 



Making it more clear by freeing the ifp in same place where the
vif object is freed.

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 5768f31e

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

+0 −2
Original line number Diff line number Diff line
@@ -867,8 +867,6 @@ static void brcmf_del_if(struct brcmf_pub *drvr, s32 bssidx) 
		}

		/* unregister will take care of freeing it */

		unregister_netdev(ifp->ndev);

	} else {

		kfree(ifp);

	}

}

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

+3 −0
Original line number Diff line number Diff line
@@ -2238,6 +2238,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;

	kfree(vif->ifp);

	brcmf_free_vif(vif);

}
@@ -2364,6 +2365,8 @@ int brcmf_p2p_del_vif(struct wiphy *wiphy, struct wireless_dev *wdev) 
		break;



	case NL80211_IFTYPE_P2P_DEVICE:

		brcmf_p2p_cancel_remain_on_channel(vif->ifp);

		brcmf_p2p_deinit_discovery(p2p);

		brcmf_p2p_delete_p2pdev(p2p, vif);

		return 0;

	default: