summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel
diff options
context:
space:
mode:
authorDanny Kukawka <danny.kukawka@bisect.de>2012-02-17 05:43:26 +0000
committerDavid S. Miller <davem@davemloft.net>2012-02-17 15:58:06 -0500
commit067fb4c81944f8965a08cd91c0a1d66ccd09feea (patch)
treec992568b7c269ab7b1e9ea161b6b261b38a1983e /drivers/net/ethernet/intel
parent5a5e7c36448664a58d13aab5a9006b01f6a58910 (diff)
downloadblackbird-op-linux-067fb4c81944f8965a08cd91c0a1d66ccd09feea.tar.gz
blackbird-op-linux-067fb4c81944f8965a08cd91c0a1d66ccd09feea.zip
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 Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/intel')
-rw-r--r--drivers/net/ethernet/intel/igbvf/netdev.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c
index 92956e80fd1b..217c143686d2 100644
--- a/drivers/net/ethernet/intel/igbvf/netdev.c
+++ b/drivers/net/ethernet/intel/igbvf/netdev.c
@@ -1712,6 +1712,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;
}
OpenPOWER on IntegriCloud