diff options
author | Jesse Brandeburg <jesse.brandeburg@intel.com> | 2006-08-31 17:27:46 -0400 |
---|---|---|
committer | Auke Kok <juke-jan.h.kok@intel.com> | 2006-08-31 17:27:46 -0400 |
commit | 120cd57644f85b280b538ee403423641167913a9 (patch) | |
tree | 32c35ef6464c0894c6c279d378493c9d6a289402 /drivers/net/e1000/e1000.h | |
parent | 1db2740d78c74eb11c4d0906047d9c13229a89a4 (diff) |
e1000: unify WoL capability detection code
WoL is constantly giving problems and needed a rewrite. Consolidates
all WoL capabilities into a single function, and disables WoL for all
other ports on the device except for port A.
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Diffstat (limited to 'drivers/net/e1000/e1000.h')
-rw-r--r-- | drivers/net/e1000/e1000.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h index 70ba3783ad80..98afa9c2057e 100644 --- a/drivers/net/e1000/e1000.h +++ b/drivers/net/e1000/e1000.h | |||
@@ -246,7 +246,6 @@ struct e1000_adapter { | |||
246 | uint32_t bd_number; | 246 | uint32_t bd_number; |
247 | uint32_t rx_buffer_len; | 247 | uint32_t rx_buffer_len; |
248 | uint32_t wol; | 248 | uint32_t wol; |
249 | uint32_t ksp3_port_a; | ||
250 | uint32_t smartspeed; | 249 | uint32_t smartspeed; |
251 | uint32_t en_mng_pt; | 250 | uint32_t en_mng_pt; |
252 | uint16_t link_speed; | 251 | uint16_t link_speed; |
@@ -341,7 +340,9 @@ struct e1000_adapter { | |||
341 | boolean_t tso_force; | 340 | boolean_t tso_force; |
342 | #endif | 341 | #endif |
343 | boolean_t smart_power_down; /* phy smart power down */ | 342 | boolean_t smart_power_down; /* phy smart power down */ |
343 | boolean_t quad_port_a; | ||
344 | unsigned long flags; | 344 | unsigned long flags; |
345 | uint32_t eeprom_wol; | ||
345 | }; | 346 | }; |
346 | 347 | ||
347 | enum e1000_state_t { | 348 | enum e1000_state_t { |