ice: Update fields in ice_vsi_set_num_qs when reconfiguring

Currently when vsi->req_txqs or vsi->req_rxqs are set we don't
correctly set the number of vsi->num_q_vectors. Fix this by
setting the number of queue vectors based on the max
between the vsi->alloc_txqs and vsi->alloc_rxqs.

Signed-off-by: Brett Creeley <brett.creeley@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c
index a39767e8c2a26064bac7670514cdf186ba5e3073..6cc01ebc0b016f889b8b8fca49edf7481dac5fcb 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_lib.c
+++ b/drivers/net/ethernet/intel/ice/ice_lib.c
@@ -345,7 +345,7 @@ static void ice_vsi_set_num_qs(struct ice_vsi *vsi, u16 vf_id)
        case ICE_VSI_PF:
                vsi->alloc_txq = pf->num_lan_tx;
                vsi->alloc_rxq = pf->num_lan_rx;
-               vsi->num_q_vectors = max_t(int, pf->num_lan_rx, pf->num_lan_tx);
+               vsi->num_q_vectors = max_t(int, vsi->alloc_rxq, vsi->alloc_txq);
                break;
        case ICE_VSI_VF:
                vf = &pf->vf[vsi->vf_id];