[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, 4 deletions

diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c
index 54ae8805e79f..fa9a4659369a 100644
--- a/drivers/net/e1000/e1000_ethtool.c
+++ b/drivers/net/e1000/e1000_ethtool.c
@@ -614,8 +614,8 @@ e1000_set_ringparam(struct net_device *netdev,
         struct e1000_rx_ring *rxdr, *rx_old, *rx_new;
         int i, err, tx_ring_size, rx_ring_size;
 
-        tx_ring_size = sizeof(struct e1000_tx_ring) * adapter->num_queues;
-        rx_ring_size = sizeof(struct e1000_rx_ring) * adapter->num_queues;
+        tx_ring_size = sizeof(struct e1000_tx_ring) * adapter->num_tx_queues;
+        rx_ring_size = sizeof(struct e1000_rx_ring) * adapter->num_rx_queues;
 
         if (netif_running(adapter->netdev))
                 e1000_down(adapter);
@@ -654,10 +654,10 @@ e1000_set_ringparam(struct net_device *netdev,
                 E1000_MAX_TXD : E1000_MAX_82544_TXD));
         E1000_ROUNDUP(txdr->count, REQ_TX_DESCRIPTOR_MULTIPLE); 
 
-        for (i = 0; i < adapter->num_queues; i++) {
+        for (i = 0; i < adapter->num_tx_queues; i++)
                 txdr[i].count = txdr->count;
+        for (i = 0; i < adapter->num_rx_queues; i++)
                 rxdr[i].count = rxdr->count;
-        }
 
         if(netif_running(adapter->netdev)) {
                 /* Try to get new resources before deleting old */