]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
igbvf: reset netdevice addr_assign_type if changed
authorDanny Kukawka <danny.kukawka@bisect.de>
Fri, 17 Feb 2012 05:43:26 +0000 (05:43 +0000)
committerJoe Jin <joe.jin@oracle.com>
Thu, 17 May 2012 13:25:05 +0000 (21:25 +0800)
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>
drivers/net/igbvf/netdev.c

index d7896aa2560e0e8b943defb296ca43e18b170234..6f12ac9f1cec747429a4c70258d9398de80a04b8 100644 (file)
@@ -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;
 }