aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/igb/e1000_hw.h
diff options
context:
space:
mode:
authorAlexander Duyck <alexander.h.duyck@intel.com>2009-10-05 02:34:25 -0400
committerDavid S. Miller <davem@davemloft.net>2009-10-06 17:59:21 -0400
commit22896639af98ebc721a94ed71fc3acf2fb4a24dc (patch)
treedd411a3246a6a01e467873dafd4417f756b961c9 /drivers/net/igb/e1000_hw.h
parent3272686c98da64d6eeaa2434782f42270b110758 (diff)
igb: change how we handle alternate mac addresses
This patch allows us to treat the alternate mac address as though it is the physical address on the adapter. This is accomplished by letting the alt_mac_address function to only fail on an NVM error. If no errors occur and the alternate mac address is not present then RAR0 is read as the default mac address. Signed-off-by: Alexander Duyck <alexander.h.duyck@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/igb/e1000_hw.h')
-rw-r--r--drivers/net/igb/e1000_hw.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/igb/e1000_hw.h b/drivers/net/igb/e1000_hw.h
index 4e7850d06147..fad7cf510cca 100644
--- a/drivers/net/igb/e1000_hw.h
+++ b/drivers/net/igb/e1000_hw.h
@@ -54,6 +54,8 @@ struct e1000_hw;
54#define E1000_FUNC_0 0 54#define E1000_FUNC_0 0
55#define E1000_FUNC_1 1 55#define E1000_FUNC_1 1
56 56
57#define E1000_ALT_MAC_ADDRESS_OFFSET_LAN1 3
58
57enum e1000_mac_type { 59enum e1000_mac_type {
58 e1000_undefined = 0, 60 e1000_undefined = 0,
59 e1000_82575, 61 e1000_82575,