e1000e: use alternate MAC address on ESB2 if available

[deliverable/linux.git] / drivers / net / e1000e / hw.h

diff --git a/drivers/net/e1000e/hw.h b/drivers/net/e1000e/hw.h
index 2784cf44a6f3304e943068d8cb1b1e99e3e32c33..127e6a226da19a816bded699f0b33dd939b9dbc9 100644 (file)
--- a/drivers/net/e1000e/hw.h
+++ b/drivers/net/e1000e/hw.h
@@ -389,6 +389,9 @@ enum e1e_registers {
 
 #define E1000_FUNC_1 1
 
+#define E1000_ALT_MAC_ADDRESS_OFFSET_LAN0   0
+#define E1000_ALT_MAC_ADDRESS_OFFSET_LAN1   3
+
 enum e1000_mac_type {
        e1000_82571,
        e1000_82572,
@@ -756,6 +759,7 @@ struct e1000_mac_operations {
        s32  (*setup_physical_interface)(struct e1000_hw *);
        s32  (*setup_led)(struct e1000_hw *);
        void (*write_vfta)(struct e1000_hw *, u32, u32);
+       s32  (*read_mac_addr)(struct e1000_hw *);
 };
 
 /* Function pointers for the PHY. */
@@ -818,6 +822,7 @@ struct e1000_mac_info {
 
        u8  forced_speed_duplex;
 
+       bool adaptive_ifs;
        bool arc_subsystem_valid;
        bool autoneg;
        bool autoneg_failed;
@@ -896,7 +901,6 @@ struct e1000_fc_info {
 
 struct e1000_dev_spec_82571 {
        bool laa_is_present;
-       bool alt_mac_addr_is_present;
        u32 smb_counter;
 };