From: Danny Kukawka Date: Sat, 18 Feb 2012 06:50:43 +0000 (-0500) Subject: cisco/enic: use eth_hw_addr_random() instead of random_ether_addr() X-Git-Tag: v2.6.39-400.9.0~338^2~41 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2512279da977c9ca633ba355b86fa033437e1bd1;p=users%2Fjedix%2Flinux-maple.git 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 (cherry picked from commit da1943164677ae2cdd630196b79089d476726348) Signed-off-by: Danny Kukawka Signed-off-by: David S. Miller Signed-off-by: Joe Jin --- diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c index 7999fadaa696..5616659a6cdd 100644 --- a/drivers/net/enic/enic_main.c +++ b/drivers/net/enic/enic_main.c @@ -868,6 +868,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; } @@ -1122,7 +1123,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) {