[PATCH] e1000: Fix adapter structure and prepare for multique fix

Fix adapter structure to handle multiple queues and prepping the driver for full multiple queue support, some changes are ifdef'd our unless you define CONFIG_E1000_MQ.

Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h
index 4dd1326dd04f..5940f7a223bc 100644
--- a/drivers/net/e1000/e1000.h
+++ b/drivers/net/e1000/e1000.h
@@ -268,6 +268,7 @@ struct e1000_adapter {
 #ifdef CONFIG_E1000_MQ
         struct e1000_tx_ring **cpu_tx_ring; /* per-cpu */
 #endif
+        unsigned long tx_queue_len;
         uint32_t txd_cmd;
         uint32_t tx_int_delay;
         uint32_t tx_abs_int_delay;
@@ -303,7 +304,8 @@ struct e1000_adapter {
         struct call_async_data_struct rx_sched_call_data;
         int cpu_for_queue[4];
 #endif
-        int num_queues;
+        int num_tx_queues;
+        int num_rx_queues;
 
         uint64_t hw_csum_err;
         uint64_t hw_csum_good;
@@ -336,6 +338,7 @@ struct e1000_adapter {
         struct e1000_rx_ring test_rx_ring;
 
 
+        u32 *config_space;
         int msg_enable;
 #ifdef CONFIG_PCI_MSI
         boolean_t have_msi;