diff options
Diffstat (limited to 'drivers/net/e1000e/hw.h')
-rw-r--r-- | drivers/net/e1000e/hw.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/e1000e/hw.h b/drivers/net/e1000e/hw.h index 8bdcd5f24eff..5d1220d188d4 100644 --- a/drivers/net/e1000e/hw.h +++ b/drivers/net/e1000e/hw.h | |||
@@ -208,6 +208,8 @@ enum e1e_registers { | |||
208 | 208 | ||
209 | E1000_KMRNCTRLSTA = 0x00034, /* MAC-PHY interface - RW */ | 209 | E1000_KMRNCTRLSTA = 0x00034, /* MAC-PHY interface - RW */ |
210 | E1000_MANC2H = 0x05860, /* Management Control To Host - RW */ | 210 | E1000_MANC2H = 0x05860, /* Management Control To Host - RW */ |
211 | E1000_MDEF_BASE = 0x05890, /* Management Decision Filters */ | ||
212 | #define E1000_MDEF(_n) (E1000_MDEF_BASE + ((_n) * 4)) | ||
211 | E1000_SW_FW_SYNC = 0x05B5C, /* Software-Firmware Synchronization - RW */ | 213 | E1000_SW_FW_SYNC = 0x05B5C, /* Software-Firmware Synchronization - RW */ |
212 | E1000_GCR = 0x05B00, /* PCI-Ex Control */ | 214 | E1000_GCR = 0x05B00, /* PCI-Ex Control */ |
213 | E1000_GCR2 = 0x05B64, /* PCI-Ex Control #2 */ | 215 | E1000_GCR2 = 0x05B64, /* PCI-Ex Control #2 */ |
@@ -380,6 +382,7 @@ enum e1e_registers { | |||
380 | #define E1000_DEV_ID_ICH10_R_BM_V 0x10CE | 382 | #define E1000_DEV_ID_ICH10_R_BM_V 0x10CE |
381 | #define E1000_DEV_ID_ICH10_D_BM_LM 0x10DE | 383 | #define E1000_DEV_ID_ICH10_D_BM_LM 0x10DE |
382 | #define E1000_DEV_ID_ICH10_D_BM_LF 0x10DF | 384 | #define E1000_DEV_ID_ICH10_D_BM_LF 0x10DF |
385 | #define E1000_DEV_ID_ICH10_D_BM_V 0x1525 | ||
383 | #define E1000_DEV_ID_PCH_M_HV_LM 0x10EA | 386 | #define E1000_DEV_ID_PCH_M_HV_LM 0x10EA |
384 | #define E1000_DEV_ID_PCH_M_HV_LC 0x10EB | 387 | #define E1000_DEV_ID_PCH_M_HV_LC 0x10EB |
385 | #define E1000_DEV_ID_PCH_D_HV_DM 0x10EF | 388 | #define E1000_DEV_ID_PCH_D_HV_DM 0x10EF |
@@ -828,6 +831,7 @@ struct e1000_mac_info { | |||
828 | u8 forced_speed_duplex; | 831 | u8 forced_speed_duplex; |
829 | 832 | ||
830 | bool adaptive_ifs; | 833 | bool adaptive_ifs; |
834 | bool has_fwsm; | ||
831 | bool arc_subsystem_valid; | 835 | bool arc_subsystem_valid; |
832 | bool autoneg; | 836 | bool autoneg; |
833 | bool autoneg_failed; | 837 | bool autoneg_failed; |
@@ -898,6 +902,7 @@ struct e1000_fc_info { | |||
898 | u32 high_water; /* Flow control high-water mark */ | 902 | u32 high_water; /* Flow control high-water mark */ |
899 | u32 low_water; /* Flow control low-water mark */ | 903 | u32 low_water; /* Flow control low-water mark */ |
900 | u16 pause_time; /* Flow control pause timer */ | 904 | u16 pause_time; /* Flow control pause timer */ |
905 | u16 refresh_time; /* Flow control refresh timer */ | ||
901 | bool send_xon; /* Flow control send XON */ | 906 | bool send_xon; /* Flow control send XON */ |
902 | bool strict_ieee; /* Strict IEEE mode */ | 907 | bool strict_ieee; /* Strict IEEE mode */ |
903 | enum e1000_fc_mode current_mode; /* FC mode in effect */ | 908 | enum e1000_fc_mode current_mode; /* FC mode in effect */ |