diff options
| author |   Waskiewicz Jr, Peter P <peter.p.waskiewicz.jr@intel.com> | 2009-05-17 12:32:48 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2009-05-17 21:04:07 -0700 |
| commit | aca6bee75fe53ae019b9cabff42095dfb6471fde (patch) | |
| tree | bf7ebd5d5f0aa301c170a98fbf8baeac13696cd0 /drivers/net/ixgbe/ixgbe_dcb_nl.c | |
| parent | ixgbe: Add FCoE Storage MAC Address support (diff) | |
| download | linux-dev-aca6bee75fe53ae019b9cabff42095dfb6471fde.tar.xz linux-dev-aca6bee75fe53ae019b9cabff42095dfb6471fde.zip | |
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 '')
| -rw-r--r-- | drivers/net/ixgbe/ixgbe_dcb_nl.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/ixgbe/ixgbe_dcb_nl.c b/drivers/net/ixgbe/ixgbe_dcb_nl.c index 99e0c106e671..5d5d390f84bf 100644 --- a/drivers/net/ixgbe/ixgbe_dcb_nl.c +++ b/drivers/net/ixgbe/ixgbe_dcb_nl.c @@ -155,10 +155,15 @@ static void ixgbe_dcbnl_get_perm_hw_addr(struct net_device *netdev, u8 *perm_addr) { struct ixgbe_adapter *adapter = netdev_priv(netdev); - int i; + int i, j; for (i = 0; i < netdev->addr_len; i++) perm_addr[i] = adapter->hw.mac.perm_addr[i]; + + if (adapter->hw.mac.type == ixgbe_mac_82599EB) { + for (j = 0; j < netdev->addr_len; j++, i++) + perm_addr[i] = adapter->hw.mac.san_addr[j]; + } } static void ixgbe_dcbnl_set_pg_tc_cfg_tx(struct net_device *netdev, int tc, |