i40e: Remove a FW workaround for Number of MSIX vectors

The Number of MSIX vectors being reported is correct and hence
we need a check to do the right thing for FWs before and after.

Change-ID: I50902d1c848adcb960ea49ac73f7865ca871a1c3
Signed-off-by: Anjali Singhai Jain <[email protected]>
Signed-off-by: Catherine Sullivan <[email protected]>
Tested-by: Kavindya Deegala <[email protected]>
Signed-off-by: Jeff Kirsher <[email protected]>

diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index fa296b8098f9443c9e3d0e84444373dc0e62701e..46b350753f4e59e75db894a734a41defd56274eb 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -5093,6 +5093,12 @@ static int i40e_get_capabilities(struct i40e_pf *pf)
        /* increment MSI-X count because current FW skips one */
        pf->hw.func_caps.num_msix_vectors++;
 
+       if (((pf->hw.aq.fw_maj_ver == 2) && (pf->hw.aq.fw_min_ver < 22)) ||
+           (pf->hw.aq.fw_maj_ver < 2)) {
+               pf->hw.func_caps.num_msix_vectors++;
+               pf->hw.func_caps.num_msix_vectors_vf++;
+       }
+
        if (pf->hw.debug_mask & I40E_DEBUG_USER)
                dev_info(&pf->pdev->dev,
                         "pf=%d, num_vfs=%d, msix_pf=%d, msix_vf=%d, fd_g=%d, fd_b=%d, pf_max_q=%d num_vsi=%d\n",