lanana: assign a device name and numbering for MAX3100

[linux-2.6-omap-h63xx.git] / drivers / net / e1000e / hw.h

diff --git a/drivers/net/e1000e/hw.h b/drivers/net/e1000e/hw.h
index 2d4ce0492df026337fcef1d125b68cf811ee2af1..d8b82296f41e042cc3a7c9b486349d58b25e1802 100644 (file)
--- a/drivers/net/e1000e/hw.h
+++ b/drivers/net/e1000e/hw.h
@@ -339,6 +339,8 @@ enum e1e_registers {
 #define E1000_DEV_ID_82573E_IAMT               0x108C
 #define E1000_DEV_ID_82573L                    0x109A
 #define E1000_DEV_ID_82574L                    0x10D3
+#define E1000_DEV_ID_82574LA                   0x10F6
+#define E1000_DEV_ID_82583V                     0x150C
 
 #define E1000_DEV_ID_80003ES2LAN_COPPER_DPT    0x1096
 #define E1000_DEV_ID_80003ES2LAN_SERDES_DPT    0x1098
@@ -376,6 +378,7 @@ enum e1000_mac_type {
        e1000_82572,
        e1000_82573,
        e1000_82574,
+       e1000_82583,
        e1000_80003es2lan,
        e1000_ich8lan,
        e1000_ich9lan,
@@ -459,6 +462,13 @@ enum e1000_smart_speed {
        e1000_smart_speed_off
 };
 
+enum e1000_serdes_link_state {
+       e1000_serdes_link_down = 0,
+       e1000_serdes_link_autoneg_progress,
+       e1000_serdes_link_autoneg_complete,
+       e1000_serdes_link_forced_up
+};
+
 /* Receive Descriptor */
 struct e1000_rx_desc {
        __le64 buffer_addr; /* Address of the descriptor's data buffer */
@@ -787,6 +797,7 @@ struct e1000_mac_info {
        bool in_ifs_mode;
        bool serdes_has_link;
        bool tx_pkt_filtering;
+       enum e1000_serdes_link_state serdes_link_state;
 };
 
 struct e1000_phy_info {