aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ixgbe/ixgbe_82598.c
diff options
context:
space:
mode:
authorWaskiewicz Jr, Peter P <peter.p.waskiewicz.jr@intel.com>2009-05-17 08:32:48 -0400
committerDavid S. Miller <davem@davemloft.net>2009-05-18 00:04:07 -0400
commitaca6bee75fe53ae019b9cabff42095dfb6471fde (patch)
treebf7ebd5d5f0aa301c170a98fbf8baeac13696cd0 /drivers/net/ixgbe/ixgbe_82598.c
parent0365e6e4373a5a447746fd7ac26074b92f180311 (diff)
ixgbe: Add SAN MAC address to the RAR, return the address to DCB
After acquiring the SAN MAC address from the EEPROM, we need to program it into one of the RARs. Also, DCB will use this MAC address to run DCBX commands, so it doesn't have to play musical MAC addresses when things like bonding enter the picture. So we need to return the MAC address through the netlink interface to userspace. This also moves the init_rx_addrs() call out of start_hw() and into reset_hw(). We shouldn't try to read any of the RAR information before initializing our internal accounting of the RAR table, which was what was happening. Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ixgbe/ixgbe_82598.c')
-rw-r--r--drivers/net/ixgbe/ixgbe_82598.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/ixgbe/ixgbe_82598.c b/drivers/net/ixgbe/ixgbe_82598.c
index e051964347e4..55186dc7dd78 100644
--- a/drivers/net/ixgbe/ixgbe_82598.c
+++ b/drivers/net/ixgbe/ixgbe_82598.c
@@ -801,6 +801,12 @@ static s32 ixgbe_reset_hw_82598(struct ixgbe_hw *hw)
801 IXGBE_WRITE_REG(hw, IXGBE_AUTOC, hw->mac.orig_autoc); 801 IXGBE_WRITE_REG(hw, IXGBE_AUTOC, hw->mac.orig_autoc);
802 } 802 }
803 803
804 /*
805 * Store MAC address from RAR0, clear receive address registers, and
806 * clear the multicast table
807 */
808 hw->mac.ops.init_rx_addrs(hw);
809
804 /* Store the permanent mac address */ 810 /* Store the permanent mac address */
805 hw->mac.ops.get_mac_addr(hw, hw->mac.perm_addr); 811 hw->mac.ops.get_mac_addr(hw, hw->mac.perm_addr);
806 812