mac80211: backport brcmfmac changes from kernel 4.18

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit c446e38c862201dd4d6a4fb8ea6e49172980952d)

1 files changed, 34 insertions, 0 deletions

diff --git a/package/kernel/mac80211/patches/330-v4.18-0001-brcmfmac-check-p2pdev-mac-address-uniqueness.patch b/package/kernel/mac80211/patches/330-v4.18-0001-brcmfmac-check-p2pdev-mac-address-uniqueness.patch
new file mode 100644
index 0000000..909000c
--- /dev/null
+++ b/package/kernel/mac80211/patches/330-v4.18-0001-brcmfmac-check-p2pdev-mac-address-uniqueness.patch
@@ -0,0 +1,34 @@
+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);
+