ixgbe: add structure for containing RX/TX rings to q_vector

This patch adds support for a ring container structure to be used within
the q_vector.  The basic idea is to provide a means of separating the RX
and TX rings while maintaining a common structure for their containment.
The advantage to this is that later we should be able to pass this
structure to the update_itr functions without needing to pass individual
rings.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/net/ixgbe/ixgbe_ethtool.c b/drivers/net/ixgbe/ixgbe_ethtool.c
index 074e9baf069a..cd842f9dcae5 100644
--- a/drivers/net/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ixgbe/ixgbe_ethtool.c
@@ -2122,7 +2122,7 @@ static int ixgbe_get_coalesce(struct net_device *netdev,
         }
 
         /* if in mixed tx/rx queues per vector mode, report only rx settings */
-        if (adapter->q_vector[0]->txr_count && adapter->q_vector[0]->rxr_count)
+        if (adapter->q_vector[0]->tx.count && adapter->q_vector[0]->rx.count)
                 return 0;
 
         /* only valid if in constant ITR mode */
@@ -2187,7 +2187,7 @@ static int ixgbe_set_coalesce(struct net_device *netdev,
         bool need_reset = false;
 
         /* don't accept tx specific changes if we've got mixed RxTx vectors */
-        if (adapter->q_vector[0]->txr_count && adapter->q_vector[0]->rxr_count
+        if (adapter->q_vector[0]->tx.count && adapter->q_vector[0]->rx.count
            && ec->tx_coalesce_usecs)
                 return -EINVAL;
 
@@ -2261,7 +2261,7 @@ static int ixgbe_set_coalesce(struct net_device *netdev,
                 int num_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
                 for (i = 0; i < num_vectors; i++) {
                         q_vector = adapter->q_vector[i];
-                        if (q_vector->txr_count && !q_vector->rxr_count)
+                        if (q_vector->tx.count && !q_vector->rx.count)
                                 /* tx only */
                                 q_vector->eitr = adapter->tx_eitr_param;
                         else