summaryrefslogtreecommitdiffstats
path: root/drivers/net/igb/igb.h
diff options
context:
space:
mode:
authorAlexander Duyck <alexander.h.duyck@intel.com>2008-07-08 15:10:46 -0700
committerJeff Garzik <jgarzik@redhat.com>2008-07-11 01:20:32 -0400
commit7dfc16fab1186769d7d0086830ab3fbc8fddfcba (patch)
tree2b5c7a9fbb1497b34d1081e2cb4052cb3893cb9c /drivers/net/igb/igb.h
parent2d064c06fecadadcb81a452acd373af00dfb1fec (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.h13
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/net/igb/igb.h b/drivers/net/igb/igb.h
index d4a04234472..ee08010d2c4 100644
--- a/drivers/net/igb/igb.h
+++ b/drivers/net/igb/igb.h
@@ -270,10 +270,7 @@ struct igb_adapter {
/* to not mess up cache alignment, always add to the bottom */
unsigned long state;
- unsigned int msi_enabled;
-#ifdef CONFIG_DCA
- unsigned int dca_enabled;
-#endif
+ unsigned int flags;
u32 eeprom_wol;
/* for ioport free */
@@ -285,6 +282,14 @@ struct igb_adapter {
#endif /* CONFIG_NETDEVICES_MULTIQUEUE */
};
+#define IGB_FLAG_HAS_MSI (1 << 0)
+#define IGB_FLAG_MSI_ENABLE (1 << 1)
+#define IGB_FLAG_HAS_DCA (1 << 2)
+#define IGB_FLAG_DCA_ENABLED (1 << 3)
+#define IGB_FLAG_IN_NETPOLL (1 << 5)
+#define IGB_FLAG_QUAD_PORT_A (1 << 6)
+#define IGB_FLAG_NEED_CTX_IDX (1 << 7)
+
enum e1000_state_t {
__IGB_TESTING,
__IGB_RESETTING,