diff options
| author | Danny Kukawka <danny.kukawka@bisect.de> | 2012-02-18 01:50:43 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-02-18 01:50:43 -0500 |
| commit | da1943164677ae2cdd630196b79089d476726348 (patch) | |
| tree | 41adfed1f0d61bc999f482c682c22cb9a5e99d2f /drivers/net/ethernet | |
| parent | b4a466765d3fb05c1f63ddc5d195980ead894ded (diff) | |
| download | op-kernel-dev-da1943164677ae2cdd630196b79089d476726348.zip op-kernel-dev-da1943164677ae2cdd630196b79089d476726348.tar.gz | |
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>
Diffstat (limited to 'drivers/net/ethernet')
| -rw-r--r-- | drivers/net/ethernet/cisco/enic/enic_main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c index dd7e24b..7dfa567 100644 --- a/drivers/net/ethernet/cisco/enic/enic_main.c +++ b/drivers/net/ethernet/cisco/enic/enic_main.c @@ -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) { |
