aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000e/e1000.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/e1000e/e1000.h')
-rw-r--r--drivers/net/e1000e/e1000.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h
index 499adb26dc1b..b941a6b509c4 100644
--- a/drivers/net/e1000e/e1000.h
+++ b/drivers/net/e1000e/e1000.h
@@ -234,6 +234,8 @@ struct e1000_adapter {
234 234
235 unsigned int rx_ps_pages; 235 unsigned int rx_ps_pages;
236 u16 rx_ps_bsize0; 236 u16 rx_ps_bsize0;
237 u32 max_frame_size;
238 u32 min_frame_size;
237 239
238 /* OS defined structs */ 240 /* OS defined structs */
239 struct net_device *netdev; 241 struct net_device *netdev;
@@ -258,7 +260,7 @@ struct e1000_adapter {
258 u32 wol; 260 u32 wol;
259 u32 pba; 261 u32 pba;
260 262
261 u8 fc_autoneg; 263 bool fc_autoneg;
262 264
263 unsigned long led_status; 265 unsigned long led_status;
264 266
@@ -305,6 +307,7 @@ struct e1000_info {
305#define FLAG_MSI_ENABLED (1 << 27) 307#define FLAG_MSI_ENABLED (1 << 27)
306#define FLAG_RX_CSUM_ENABLED (1 << 28) 308#define FLAG_RX_CSUM_ENABLED (1 << 28)
307#define FLAG_TSO_FORCE (1 << 29) 309#define FLAG_TSO_FORCE (1 << 29)
310#define FLAG_RX_RESTART_NOW (1 << 30)
308 311
309#define E1000_RX_DESC_PS(R, i) \ 312#define E1000_RX_DESC_PS(R, i) \
310 (&(((union e1000_rx_desc_packet_split *)((R).desc))[i])) 313 (&(((union e1000_rx_desc_packet_split *)((R).desc))[i]))