brcmfmac: change mac address parameter in brcmf_add_if()

The function brcmf_add_if() is called with mac address set to NULL
for the primary interface. When handling IF ADD events the firmware
provides a address mask in the event to derive its mac address from
the primary mac address. Rename the parameter and use it as a mask.

Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 7 insertions, 5 deletions

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
index 32b73550e5ad..9a590cb06d93 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
@@ -690,10 +690,11 @@ fail:
 }
 
 struct brcmf_if *brcmf_add_if(struct brcmf_pub *drvr, int ifidx, s32 bssidx,
-                              char *name, u8 *mac_addr)
+                              char *name, u8 *addr_mask)
 {
         struct brcmf_if *ifp;
         struct net_device *ndev;
+        int i;
 
         brcmf_dbg(TRACE, "idx %d\n", ifidx);
 
@@ -728,11 +729,12 @@ struct brcmf_if *brcmf_add_if(struct brcmf_pub *drvr, int ifidx, s32 bssidx,
         INIT_WORK(&ifp->setmacaddr_work, _brcmf_set_mac_address);
         INIT_WORK(&ifp->multicast_work, _brcmf_set_multicast_list);
 
-        if (mac_addr != NULL)
-                memcpy(&ifp->mac_addr, mac_addr, ETH_ALEN);
+        if (addr_mask != NULL)
+                for (i = 0; i < ETH_ALEN; i++)
+                        ifp->mac_addr[i] = drvr->mac[i] ^ addr_mask[i];
 
-        brcmf_dbg(TRACE, " ==== pid:%x, net_device for if:%s created ===\n",
-                  current->pid, ifp->ndev->name);
+        brcmf_dbg(TRACE, " ==== pid:%x, if:%s (%pM) created ===\n",
+                  current->pid, ifp->ndev->name, ifp->mac_addr);
 
         return ifp;
 }