Commit c3a392bd authored by Michal Swiatkowski's avatar Michal Swiatkowski Committed by Tony Nguyen
Browse files

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: default avatarJacob Keller <jacob.e.keller@intel.com>
Tested-by: default avatarPucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com>
Signed-off-by: default avatarMichal Swiatkowski <michal.swiatkowski@linux.intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent c2933b2b

drivers/net/ethernet/intel/ice/ice_ethtool.c

+1 −2
Original line number Diff line number Diff line
@@ -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;