netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v3] cisco/enic: use eth_hw_addr_random() instead of random_ether_addr()
@ 2012-02-17 22:13 Danny Kukawka
  2012-02-18  6:50 ` David Miller
  0 siblings, 1 reply; 2+ messages in thread
From: Danny Kukawka @ 2012-02-17 22:13 UTC (permalink / raw)
  To: Christian Benvenuti
  Cc: Danny Kukawka, Roopa Prabhu, David S. Miller, David Wang, netdev,
	linux-kernel

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>
---
 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) {
-- 
1.7.8.3

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH v3] cisco/enic: use eth_hw_addr_random() instead of random_ether_addr()
  2012-02-17 22:13 [PATCH v3] cisco/enic: use eth_hw_addr_random() instead of random_ether_addr() Danny Kukawka
@ 2012-02-18  6:50 ` David Miller
  0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2012-02-18  6:50 UTC (permalink / raw)
  To: danny.kukawka; +Cc: benve, dkukawka, roprabhu, dwang2, netdev, linux-kernel

From: Danny Kukawka <danny.kukawka@bisect.de>
Date: Fri, 17 Feb 2012 23:13:30 +0100

> 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>

Applied, thanks.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-02-18  6:50 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-17 22:13 [PATCH v3] cisco/enic: use eth_hw_addr_random() instead of random_ether_addr() Danny Kukawka
2012-02-18  6:50 ` David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).