ice: count combined queues using Rx/Tx count

Previous implementation assumes that there is 1:1 matching between
vectors and queues. It isn't always true.

Get minimum value from Rx/Tx queues to determine combined queues number.

Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com>
Signed-off-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/ice/ice_ethtool.c b/drivers/net/ethernet/intel/ice/ice_ethtool.c
index f241493a6ac883531017ef5fe14932b9e24eaa5c..6bbb304ad9ab74e364e8a965a51b01ffd013b8fd 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_ethtool.c
+++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c
@@ -3817,8 +3817,7 @@ static u32 ice_get_combined_cnt(struct ice_vsi *vsi)
        ice_for_each_q_vector(vsi, q_idx) {
                struct ice_q_vector *q_vector = vsi->q_vectors[q_idx];
 
-               if (q_vector->rx.rx_ring && q_vector->tx.tx_ring)
-                       combined++;
+               combined += min(q_vector->num_ring_tx, q_vector->num_ring_rx);
        }
 
        return combined;