From: Danny Kukawka <danny.kukawka@bisect.de>
Date: Fri, 17 Feb 2012 05:43:26 +0000 (+0000)
Subject: igbvf: reset netdevice addr_assign_type if changed
X-Git-Tag: v2.6.39-400.9.0~423^2~19^2~11^2~227
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f65c9e793141c48ff1fbde1cf2c7f70e2763862d;p=users%2Fjedix%2Flinux-maple.git

igbvf: reset netdevice addr_assign_type if changed

Reset the state of addr_assign_type to NET_ADDR_PERM as soon as
the MAC get changed via .ndo_set_mac_address.

v2: use bitops to reset addr_assign_type

(cherry picked from commit 067fb4c81944f8965a08cd91c0a1d66ccd09feea)
Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Joe Jin <joe.jin@oracle.com>
---

diff --git a/drivers/net/igbvf/netdev.c b/drivers/net/igbvf/netdev.c
index d7896aa2560e..6f12ac9f1cec 100644
--- a/drivers/net/igbvf/netdev.c
+++ b/drivers/net/igbvf/netdev.c
@@ -1708,6 +1708,7 @@ static int igbvf_set_mac(struct net_device *netdev, void *p)
 		return -EADDRNOTAVAIL;
 
 	memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
+	netdev->addr_assign_type &= ~NET_ADDR_RANDOM;
 
 	return 0;
 }