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

Commit cb746e47 authored by Arend Van Spriel's avatar Arend Van Spriel Committed by Kalle Valo
Browse files

brcmfmac: check p2pdev mac address uniqueness 



The mac address for p2pdev must be different from the primary interface
due to firmware requirement. Add an explicit check for this requirement
if user-space provides a mac address.

Reviewed-by: default avatarHante Meuleman <hante.meuleman@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
Reviewed-by: default avatarFranky Lin <franky.lin@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 3ea0a58c

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

+7 −0
Original line number Original line Diff line number Diff line
@@ -2073,6 +2073,13 @@ static struct wireless_dev *brcmf_p2p_create_p2pdev(struct brcmf_p2p_info *p2p, 
	}

	}





	pri_ifp = p2p->bss_idx[P2PAPI_BSSCFG_PRIMARY].vif->ifp;

	pri_ifp = p2p->bss_idx[P2PAPI_BSSCFG_PRIMARY].vif->ifp;



	/* firmware requires unique mac address for p2pdev interface */

	if (addr && ether_addr_equal(addr, pri_ifp->mac_addr)) {

		brcmf_err("discovery vif must be different from primary interface\n");

		return ERR_PTR(-EINVAL);

	}



	brcmf_p2p_generate_bss_mac(p2p, addr);

	brcmf_p2p_generate_bss_mac(p2p, addr);

	brcmf_p2p_set_firmware(pri_ifp, p2p->dev_addr);

	brcmf_p2p_set_firmware(pri_ifp, p2p->dev_addr);