35 lines
1.4 KiB
Diff
35 lines
1.4 KiB
Diff
|
From cb746e47837ad0f35c8ae28e9aacc8eb07916d2a Mon Sep 17 00:00:00 2001
|
||
|
|
From: Arend Van Spriel <arend.vanspriel@broadcom.com>
|
||
|
|
Date: Thu, 26 Apr 2018 12:16:47 +0200
|
||
|
|
Subject: [PATCH] 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: Hante Meuleman <hante.meuleman@broadcom.com>
|
||
|
|
Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
|
||
|
|
Reviewed-by: Franky Lin <franky.lin@broadcom.com>
|
||
|
|
Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
|
||
|
|
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
|
||
|
|
---
|
||
|
|
drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 7 +++++++
|
||
|
|
1 file changed, 7 insertions(+)
|
||
|
|
|
||
|
|
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
|
||
|
|
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
|
||
|
|
@@ -2073,6 +2073,13 @@ static struct wireless_dev *brcmf_p2p_cr
|
||
|
|
}
|
||
|
|
|
||
|
|
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_set_firmware(pri_ifp, p2p->dev_addr);
|
||
|
|
|