diff options
author | Bruce Allan <bruce.w.allan@intel.com> | 2008-11-21 19:57:36 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-21 19:57:36 -0500 |
commit | 5c48ef3e2028677a890d46d9a38b19174274f2e9 (patch) | |
tree | 1ef4a75e9054eafa127609bd31f7999dc1fe085f /drivers/net/e1000e/hw.h | |
parent | 8f12fe8653eb699a6bc4f88f1a80312466ea2b0e (diff) |
e1000e: sync change flow control variables with ixgbe
Sync flow control variables and usage model with that found in the ixgbe
driver.
Signed-off-by: Bruce Allan <bruce.w.allan@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/e1000e/hw.h')
-rw-r--r-- | drivers/net/e1000e/hw.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/e1000e/hw.h b/drivers/net/e1000e/hw.h index ac1efb9ac58b..f25e961c6b3b 100644 --- a/drivers/net/e1000e/hw.h +++ b/drivers/net/e1000e/hw.h | |||
@@ -437,7 +437,7 @@ enum e1000_rev_polarity{ | |||
437 | e1000_rev_polarity_undefined = 0xFF | 437 | e1000_rev_polarity_undefined = 0xFF |
438 | }; | 438 | }; |
439 | 439 | ||
440 | enum e1000_fc_type { | 440 | enum e1000_fc_mode { |
441 | e1000_fc_none = 0, | 441 | e1000_fc_none = 0, |
442 | e1000_fc_rx_pause, | 442 | e1000_fc_rx_pause, |
443 | e1000_fc_tx_pause, | 443 | e1000_fc_tx_pause, |
@@ -850,8 +850,8 @@ struct e1000_fc_info { | |||
850 | u16 pause_time; /* Flow control pause timer */ | 850 | u16 pause_time; /* Flow control pause timer */ |
851 | bool send_xon; /* Flow control send XON */ | 851 | bool send_xon; /* Flow control send XON */ |
852 | bool strict_ieee; /* Strict IEEE mode */ | 852 | bool strict_ieee; /* Strict IEEE mode */ |
853 | enum e1000_fc_type type; /* Type of flow control */ | 853 | enum e1000_fc_mode current_mode; /* FC mode in effect */ |
854 | enum e1000_fc_type original_type; | 854 | enum e1000_fc_mode requested_mode; /* FC mode requested by caller */ |
855 | }; | 855 | }; |
856 | 856 | ||
857 | struct e1000_dev_spec_82571 { | 857 | struct e1000_dev_spec_82571 { |