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

Commit fa42245d authored by Hari Vyas's avatar Hari Vyas Committed by David S. Miller
Browse files

net: ethernet: bgmac: mac address change bug 



ndo_set_mac_address() passes struct sockaddr * as 2nd parameter to
bgmac_set_mac_address() but code assumed u8 *.  This caused two bytes
chopping and the wrong mac address was configured.

Signed-off-by: default avatarHari Vyas <hariv@broadcom.com>
Signed-off-by: default avatarJon Mason <jon.mason@broadcom.com>
Fixes: 4e209001 ("bgmac: write mac address to hardware in ndo_set_mac_address")
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 16206524

drivers/net/ethernet/broadcom/bgmac.c

+5 −1
Original line number Diff line number Diff line
@@ -1223,12 +1223,16 @@ static netdev_tx_t bgmac_start_xmit(struct sk_buff *skb, 
static int bgmac_set_mac_address(struct net_device *net_dev, void *addr)

{

	struct bgmac *bgmac = netdev_priv(net_dev);

	struct sockaddr *sa = addr;

	int ret;



	ret = eth_prepare_mac_addr_change(net_dev, addr);

	if (ret < 0)

		return ret;

	bgmac_write_mac_address(bgmac, (u8 *)addr);



	ether_addr_copy(net_dev->dev_addr, sa->sa_data);

	bgmac_write_mac_address(bgmac, net_dev->dev_addr);



	eth_commit_mac_addr_change(net_dev, addr);

	return 0;

}