mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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: Danny Kukawka <danny.kukawka@bisect.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Danny Kukawka 2012-02-18 01:50:43 -05:00 committed by David S. Miller
parent b4a466765d
commit da19431646
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/ethernet/cisco/enic/enic_main.c
View File

@ -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;
}
@ -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) {