fm10k: base queue scheme covered by RSS

In fm10k_set_num_queues, we previously assigned the base template. This
would always be overwritten by either fm10k_set_qos_queues or
fm10k_set_rss_queues. In either case, we don't need the base values, so
we can just remove them.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Krishneil Singh <Krishneil.k.singh@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Orabug: 25394529
(cherry picked from commit b3525696adba1ecddff3d667680461cc533e63a4)
Signed-off-by: Jack Vogel <jack.vogel@oracle.com>

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_main.c b/drivers/net/ethernet/intel/fm10k/fm10k_main.c
index d5608dbe2f4e9a7bb138a43b58b2ab76d2939a7e..92ce5caa8a7712f3a39d051fa01395a064f1f91a 100644 (file)
--- a/drivers/net/ethernet/intel/fm10k/fm10k_main.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_main.c
@@ -1572,13 +1572,11 @@ static bool fm10k_set_rss_queues(struct fm10k_intfc *interface)
  **/
 static void fm10k_set_num_queues(struct fm10k_intfc *interface)
 {
-       /* Start with base case */
-       interface->num_rx_queues = 1;
-       interface->num_tx_queues = 1;
-
+       /* Attempt to setup QoS and RSS first */
        if (fm10k_set_qos_queues(interface))
                return;
 
+       /* If we don't have QoS, just fallback to only RSS. */
        fm10k_set_rss_queues(interface);
 }