Commit da194316 authored by Danny Kukawka's avatar Danny Kukawka Committed by David S. Miller

cisco/enic: use eth_hw_addr_random() instead of random_ether_addr()

Use dev_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.

v3: adapt to net-next
v2: use bitops, adapt to eth_hw_addr_random(), add a comment
Signed-off-by: default avatarDanny Kukawka <danny.kukawka@bisect.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b4a46676
...@@ -865,6 +865,7 @@ static int enic_set_mac_addr(struct net_device *netdev, char *addr) ...@@ -865,6 +865,7 @@ static int enic_set_mac_addr(struct net_device *netdev, char *addr)
} }
memcpy(netdev->dev_addr, addr, netdev->addr_len); memcpy(netdev->dev_addr, addr, netdev->addr_len);
netdev->addr_assign_type &= ~NET_ADDR_RANDOM;
return 0; return 0;
} }
...@@ -1119,7 +1120,7 @@ static int enic_set_vf_port(struct net_device *netdev, int vf, ...@@ -1119,7 +1120,7 @@ static int enic_set_vf_port(struct net_device *netdev, int vf,
memcpy(pp->mac_addr, prev_pp.vf_mac, ETH_ALEN); memcpy(pp->mac_addr, prev_pp.vf_mac, ETH_ALEN);
if (vf == PORT_SELF_VF && is_zero_ether_addr(netdev->dev_addr)) if (vf == PORT_SELF_VF && is_zero_ether_addr(netdev->dev_addr))
random_ether_addr(netdev->dev_addr); eth_hw_addr_random(netdev);
err = enic_process_set_pp_request(enic, vf, &prev_pp, &restore_pp); err = enic_process_set_pp_request(enic, vf, &prev_pp, &restore_pp);
if (err) { if (err) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment