summaryrefslogtreecommitdiffstats
path: root/drivers/net/ixgbe/ixgbe_82599.c
diff options
context:
space:
mode:
authorEmil Tantilov <emil.s.tantilov@intel.com>2011-02-19 08:43:49 +0000
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2011-03-03 04:22:00 -0800
commit278675d855e03e111ca84fec6eb7d5569e56c394 (patch)
tree4e934013e8a3450e33f3a8d21bffcb0eafc3b787 /drivers/net/ixgbe/ixgbe_82599.c
parent8c7bea32c4ebe02dbb574a49db418036da177326 (diff)
downloadop-kernel-dev-278675d855e03e111ca84fec6eb7d5569e56c394.zip
op-kernel-dev-278675d855e03e111ca84fec6eb7d5569e56c394.tar.gz
ixgbe: store permanent address before initializing Rx addresses
We were reading the address after it had been initialized and this results in the permanent address on the system being changed. This change corrects that by storing the address before we re-initialize it. Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com> Tested-by: Stephen Ko <stephen.s.ko@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ixgbe/ixgbe_82599.c')
-rw-r--r--drivers/net/ixgbe/ixgbe_82599.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ixgbe/ixgbe_82599.c b/drivers/net/ixgbe/ixgbe_82599.c
index 5e2edcd..3d40e68 100644
--- a/drivers/net/ixgbe/ixgbe_82599.c
+++ b/drivers/net/ixgbe/ixgbe_82599.c
@@ -965,6 +965,9 @@ mac_reset_top:
}
}
+ /* Store the permanent mac address */
+ hw->mac.ops.get_mac_addr(hw, hw->mac.perm_addr);
+
/*
* Store MAC address from RAR0, clear receive address registers, and
* clear the multicast table. Also reset num_rar_entries to 128,
@@ -973,9 +976,6 @@ mac_reset_top:
hw->mac.num_rar_entries = 128;
hw->mac.ops.init_rx_addrs(hw);
- /* Store the permanent mac address */
- hw->mac.ops.get_mac_addr(hw, hw->mac.perm_addr);
-
/* Store the permanent SAN mac address */
hw->mac.ops.get_san_mac_addr(hw, hw->mac.san_addr);
OpenPOWER on IntegriCloud