Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Merge 'net' bug fixes into 'net-next' as we have patches that will build on top of them. This merge commit includes a change from Emil Goode (emilgoode@gmail.com) that fixes a warning that would have been introduced by this merge. Specifically it fixes the pingv6_ops method ipv6_chk_addr() to add a "const" to the "struct net_device *dev" argument and likewise update the dummy_ipv6_chk_addr() declaration. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -1037,6 +1037,18 @@ static void fec_get_mac(struct net_device *ndev)
|
||||
iap = &tmpaddr[0];
|
||||
}
|
||||
|
||||
/*
|
||||
* 5) random mac address
|
||||
*/
|
||||
if (!is_valid_ether_addr(iap)) {
|
||||
/* Report it and use a random ethernet address instead */
|
||||
netdev_err(ndev, "Invalid MAC address: %pM\n", iap);
|
||||
eth_hw_addr_random(ndev);
|
||||
netdev_info(ndev, "Using random MAC address: %pM\n",
|
||||
ndev->dev_addr);
|
||||
return;
|
||||
}
|
||||
|
||||
memcpy(ndev->dev_addr, iap, ETH_ALEN);
|
||||
|
||||
/* Adjust MAC if using macaddr */
|
||||
|
Reference in New Issue
Block a user