From df26a288de574075bebb93a2e5c286e134f07916 Mon Sep 17 00:00:00 2001 From: Danny Kukawka Date: Sat, 18 Feb 2012 01:50:43 -0500 Subject: [PATCH] --- yaml --- r: 290208 b: refs/heads/master c: da1943164677ae2cdd630196b79089d476726348 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/cisco/enic/enic_main.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e2c7fcf492ff..1abfd5ac532a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b4a466765d3fb05c1f63ddc5d195980ead894ded +refs/heads/master: da1943164677ae2cdd630196b79089d476726348 diff --git a/trunk/drivers/net/ethernet/cisco/enic/enic_main.c b/trunk/drivers/net/ethernet/cisco/enic/enic_main.c index dd7e24b9ffbb..7dfa567b7e04 100644 --- a/trunk/drivers/net/ethernet/cisco/enic/enic_main.c +++ b/trunk/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) {