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

Commit 9bcb74f9 authored by Arend van Spriel's avatar Arend van Spriel Committed by John W. Linville
Browse files

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: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: default avatarHante Meuleman <meuleman@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 607d5c0e

drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c

+7 −5
Original line number Original line Diff line number Diff line
@@ -690,10 +690,11 @@ int brcmf_net_attach(struct brcmf_if *ifp) 
}

}





struct brcmf_if *brcmf_add_if(struct brcmf_pub *drvr, int ifidx, s32 bssidx,

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 brcmf_if *ifp;

	struct net_device *ndev;

	struct net_device *ndev;

	int i;





	brcmf_dbg(TRACE, "idx %d\n", ifidx);

	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->setmacaddr_work, _brcmf_set_mac_address);

	INIT_WORK(&ifp->multicast_work, _brcmf_set_multicast_list);

	INIT_WORK(&ifp->multicast_work, _brcmf_set_multicast_list);





	if (mac_addr != NULL)

	if (addr_mask != NULL)

		memcpy(&ifp->mac_addr, mac_addr, ETH_ALEN);

		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",

	brcmf_dbg(TRACE, " ==== pid:%x, if:%s (%pM) created ===\n",

		  current->pid, ifp->ndev->name);

		  current->pid, ifp->ndev->name, ifp->mac_addr);





	return ifp;

	return ifp;

}

}