summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHari Vyas <hariv@broadcom.com>2017-03-02 17:59:57 -0500
committerDavid S. Miller <davem@davemloft.net>2017-03-03 09:44:28 -0800
commitfa42245dff4a5f2f8f208da542acbd80c22f7c65 (patch)
treee8563495264c20d363e421cdcd9aa3291b0d5bf8
parent16206524f6ea57d6dcd56fe46f9f4a06d4a1b113 (diff)
downloadlinux-stable-fa42245dff4a5f2f8f208da542acbd80c22f7c65.tar.gz
linux-stable-fa42245dff4a5f2f8f208da542acbd80c22f7c65.tar.bz2
linux-stable-fa42245dff4a5f2f8f208da542acbd80c22f7c65.zip
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: Hari Vyas <hariv@broadcom.com> Signed-off-by: Jon Mason <jon.mason@broadcom.com> Fixes: 4e209001b86 ("bgmac: write mac address to hardware in ndo_set_mac_address") Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/broadcom/bgmac.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c
index 415046750bb4..fd66fca00e01 100644
--- a/drivers/net/ethernet/broadcom/bgmac.c
+++ b/drivers/net/ethernet/broadcom/bgmac.c
@@ -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;
}