summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorEmil Tantilov <emil.s.tantilov@intel.com>2018-05-14 11:16:16 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-08-03 07:47:49 +0200
commite775c2bc95000ccb3fbdb6e404caf205859e360e (patch)
tree2725cb718181dc6ab4be1731b8dd5be9215c89e2 /drivers/net
parentb5dd1888d3c6de1878e0d5d30c2e57c3f6b5205a (diff)
downloadlinux-stable-e775c2bc95000ccb3fbdb6e404caf205859e360e.tar.gz
linux-stable-e775c2bc95000ccb3fbdb6e404caf205859e360e.tar.bz2
linux-stable-e775c2bc95000ccb3fbdb6e404caf205859e360e.zip
ixgbevf: fix MAC address changes through ixgbevf_set_mac()
[ Upstream commit 6e7d0ba1e59b1a306761a731e67634c0f2efea2a ] Set hw->mac.perm_addr in ixgbevf_set_mac() in order to avoid losing the custom MAC on reset. This can happen in the following case: >ip link set $vf address $mac >ethtool -r $vf Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com> Tested-by: Andrew Bowers <andrewx.bowers@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index 850f8af95e49..043b695d2a61 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -4187,6 +4187,7 @@ static int ixgbevf_set_mac(struct net_device *netdev, void *p)
return -EPERM;
ether_addr_copy(hw->mac.addr, addr->sa_data);
+ ether_addr_copy(hw->mac.perm_addr, addr->sa_data);
ether_addr_copy(netdev->dev_addr, addr->sa_data);
return 0;