diff options
author | Alexander Duyck <alexander.h.duyck@intel.com> | 2008-07-08 18:10:46 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-07-11 01:20:32 -0400 |
commit | 7dfc16fab1186769d7d0086830ab3fbc8fddfcba (patch) | |
tree | 2b5c7a9fbb1497b34d1081e2cb4052cb3893cb9c /drivers/net/igb/igb.h | |
parent | 2d064c06fecadadcb81a452acd373af00dfb1fec (diff) |
igb: Add support for quad port WOL and feature flags
Change igb from using a series of boolean operators to using a single flags
value that contains a number of different bit flags for all the different
features of the adapter.
This patch also adds WOL support for quad port adapters.
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/igb/igb.h')
-rw-r--r-- | drivers/net/igb/igb.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/net/igb/igb.h b/drivers/net/igb/igb.h index d4a042344728..ee08010d2c4f 100644 --- a/drivers/net/igb/igb.h +++ b/drivers/net/igb/igb.h | |||
@@ -270,10 +270,7 @@ struct igb_adapter { | |||
270 | 270 | ||
271 | /* to not mess up cache alignment, always add to the bottom */ | 271 | /* to not mess up cache alignment, always add to the bottom */ |
272 | unsigned long state; | 272 | unsigned long state; |
273 | unsigned int msi_enabled; | 273 | unsigned int flags; |
274 | #ifdef CONFIG_DCA | ||
275 | unsigned int dca_enabled; | ||
276 | #endif | ||
277 | u32 eeprom_wol; | 274 | u32 eeprom_wol; |
278 | 275 | ||
279 | /* for ioport free */ | 276 | /* for ioport free */ |
@@ -285,6 +282,14 @@ struct igb_adapter { | |||
285 | #endif /* CONFIG_NETDEVICES_MULTIQUEUE */ | 282 | #endif /* CONFIG_NETDEVICES_MULTIQUEUE */ |
286 | }; | 283 | }; |
287 | 284 | ||
285 | #define IGB_FLAG_HAS_MSI (1 << 0) | ||
286 | #define IGB_FLAG_MSI_ENABLE (1 << 1) | ||
287 | #define IGB_FLAG_HAS_DCA (1 << 2) | ||
288 | #define IGB_FLAG_DCA_ENABLED (1 << 3) | ||
289 | #define IGB_FLAG_IN_NETPOLL (1 << 5) | ||
290 | #define IGB_FLAG_QUAD_PORT_A (1 << 6) | ||
291 | #define IGB_FLAG_NEED_CTX_IDX (1 << 7) | ||
292 | |||
288 | enum e1000_state_t { | 293 | enum e1000_state_t { |
289 | __IGB_TESTING, | 294 | __IGB_TESTING, |
290 | __IGB_RESETTING, | 295 | __IGB_RESETTING, |