net: use eth_hw_addr_random() and reset addr_assign_type
Use eth_hw_addr_random() instead of calling random_ether_addr() to set addr_assign_type correctly to NET_ADDR_RANDOM. Reset the state to NET_ADDR_PERM as soon as the MAC get changed via .ndo_set_mac_address. v2: adapt to renamed eth_hw_addr_random() Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
committed by
David S. Miller
parent
f2cedb63df
commit
7ce5d22219
@@ -372,6 +372,7 @@ static int macvlan_set_mac_address(struct net_device *dev, void *p)
|
||||
|
||||
if (!(dev->flags & IFF_UP)) {
|
||||
/* Just copy in the new address */
|
||||
dev->addr_assign_type &= ~NET_ADDR_RANDOM;
|
||||
memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN);
|
||||
} else {
|
||||
/* Rehash and update the device filters */
|
||||
@@ -687,7 +688,7 @@ int macvlan_common_newlink(struct net *src_net, struct net_device *dev,
|
||||
return -EINVAL;
|
||||
|
||||
if (!tb[IFLA_ADDRESS])
|
||||
random_ether_addr(dev->dev_addr);
|
||||
eth_hw_addr_random(dev);
|
||||
|
||||
if (!macvlan_port_exists(lowerdev)) {
|
||||
err = macvlan_port_create(lowerdev);
|
||||
|
||||
Reference in New Issue
Block a user