package/kernel/mac80211/patches/330-v4.18-0001-brcmfmac-check-p2pdev-mac-address-uniqueness.patch

   1 From cb746e47837ad0f35c8ae28e9aacc8eb07916d2a Mon Sep 17 00:00:00 2001
   2 From: Arend Van Spriel <arend.vanspriel@broadcom.com>
   3 Date: Thu, 26 Apr 2018 12:16:47 +0200
   4 Subject: [PATCH] brcmfmac: check p2pdev mac address uniqueness
   5
   6 The mac address for p2pdev must be different from the primary interface
   7 due to firmware requirement. Add an explicit check for this requirement
   8 if user-space provides a mac address.
   9
  10 Reviewed-by: Hante Meuleman <hante.meuleman@broadcom.com>
  11 Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
  12 Reviewed-by: Franky Lin <franky.lin@broadcom.com>
  13 Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
  14 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  15 ---
  16  drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 7 +++++++
  17  1 file changed, 7 insertions(+)
  18
  19 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
  20 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
  21 @@ -2073,6 +2073,13 @@ static struct wireless_dev *brcmf_p2p_cr
  22         }
  23
  24         pri_ifp = p2p->bss_idx[P2PAPI_BSSCFG_PRIMARY].vif->ifp;
  25 +
  26 +       /* firmware requires unique mac address for p2pdev interface */
  27 +       if (addr && ether_addr_equal(addr, pri_ifp->mac_addr)) {
  28 +               brcmf_err("discovery vif must be different from primary interface\n");
  29 +               return ERR_PTR(-EINVAL);
  30 +       }
  31 +
  32         brcmf_p2p_generate_bss_mac(p2p, addr);
  33         brcmf_p2p_set_firmware(pri_ifp, p2p->dev_addr);
  34