android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ethoc: fix mac address set

Browse Source 
Function ethoc_set_mac_address() was incorrectly using passed pointer as
pointer to address, that is not correct.
Struct sockaddr have to be be used here.

Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jiri Pirko
2013-01-06 03:25:45 +00:00
committed by David S. Miller
parent b681b65d4f
commit efc61a3442
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/net/ethernet/ethoc.c
View File

@ -771,20 +771,24 @@ static int ethoc_config(struct net_device *dev, struct ifmap *map)
return -ENOSYS; return -ENOSYS;
} }
static int ethoc_set_mac_address(struct net_device *dev, void *addr) static void ethoc_do_set_mac_address(struct net_device *dev)
{ {
struct ethoc *priv = netdev_priv(dev); struct ethoc *priv = netdev_priv(dev);
u8 *mac = (u8 *)addr; unsigned char *mac = dev->dev_addr;
if (!is_valid_ether_addr(mac))
return -EADDRNOTAVAIL;
ethoc_write(priv, MAC_ADDR0, (mac[2] << 24) | (mac[3] << 16) | ethoc_write(priv, MAC_ADDR0, (mac[2] << 24) | (mac[3] << 16) |
(mac[4] << 8) | (mac[5] << 0)); (mac[4] << 8) | (mac[5] << 0));
ethoc_write(priv, MAC_ADDR1, (mac[0] << 8) | (mac[1] << 0)); ethoc_write(priv, MAC_ADDR1, (mac[0] << 8) | (mac[1] << 0));
}
memcpy(dev->dev_addr, mac, ETH_ALEN); static int ethoc_set_mac_address(struct net_device *dev, void *p)
{
const struct sockaddr *addr = p;
if (!is_valid_ether_addr(addr->sa_data))
return -EADDRNOTAVAIL;
memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN);
ethoc_do_set_mac_address(dev);
return 0; return 0;
} }
@ -1060,11 +1064,7 @@ static int ethoc_probe(struct platform_device *pdev)
random_mac = true; random_mac = true;
} }
ret = ethoc_set_mac_address(netdev, netdev->dev_addr); ethoc_do_set_mac_address(netdev);
if (ret) {
dev_err(&netdev->dev, "failed to set MAC address\n");
goto error;
}
if (random_mac) if (random_mac)
netdev->addr_assign_type = NET_ADDR_RANDOM; netdev->addr_assign_type = NET_ADDR_RANDOM;