Skip to content

Commit

Permalink
cisco/enic: use eth_hw_addr_random() instead of random_ether_addr()
Browse files Browse the repository at this point in the history
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: Danny Kukawka <danny.kukawka@bisect.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Danny Kukawka authored and David S. Miller committed Feb 18, 2012
1 parent b4a4667 commit da19431
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/net/ethernet/cisco/enic/enic_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -865,6 +865,7 @@ static int enic_set_mac_addr(struct net_device *netdev, char *addr)
}

memcpy(netdev->dev_addr, addr, netdev->addr_len);
netdev->addr_assign_type &= ~NET_ADDR_RANDOM;

return 0;
}
Expand Down Expand Up @@ -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);

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);
if (err) {
Expand Down

0 comments on commit da19431

Please sign in to comment.