From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Jacob Keller <jacob.e.keller@intel.com>,
netdev@vger.kernel.org, nhorman@redhat.com, sassmann@redhat.com,
jogreene@redhat.com, Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next 09/16] fm10k: base queue scheme covered by RSS
Date: Tue, 5 Apr 2016 01:01:21 -0700 [thread overview]
Message-ID: <1459843288-40623-10-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1459843288-40623-1-git-send-email-jeffrey.t.kirsher@intel.com>
From: Jacob Keller <jacob.e.keller@intel.com>
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>
---
drivers/net/ethernet/intel/fm10k/fm10k_main.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_main.c b/drivers/net/ethernet/intel/fm10k/fm10k_main.c
index db4353b..b87401c38 100644
--- 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);
}
--
2.5.5
next prev parent reply other threads:[~2016-04-05 8:01 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-05 8:01 [net-next 00/16][pull request] 100GbE Intel Wired LAN Driver Updates 2016-04-05 Jeff Kirsher
2016-04-05 8:01 ` [net-next 01/16] fm10k: Move constants to the right of binary operators Jeff Kirsher
2016-04-05 8:01 ` [net-next 02/16] fm10k: cleanup remaining right-bit-shifted 1 Jeff Kirsher
2016-04-05 8:01 ` [net-next 03/16] fm10k: Avoid crashing the kernel Jeff Kirsher
2016-04-05 8:13 ` Joe Perches
2016-04-05 16:12 ` David Miller
2016-04-06 23:24 ` Keller, Jacob E
2016-04-05 8:01 ` [net-next 04/16] fm10k: demote BUG_ON() to WARN_ON() where appropriate Jeff Kirsher
2016-04-05 8:01 ` [net-next 05/16] fm10k: cleanup SPACE_BEFORE_TAB checkpatch warning Jeff Kirsher
2016-04-05 8:01 ` [net-next 06/16] fm10k: use ether_addr_copy to copy MAC address Jeff Kirsher
2016-04-05 8:01 ` [net-next 07/16] fm10k: prevent null pointer dereference of msix_entries table Jeff Kirsher
2016-04-05 8:01 ` [net-next 08/16] fm10k: don't initialize service task until later in probe Jeff Kirsher
2016-04-05 8:01 ` Jeff Kirsher [this message]
2016-04-05 8:01 ` [net-next 10/16] fm10k: print error message when stop_hw fails Jeff Kirsher
2016-04-05 8:01 ` [net-next 11/16] fm10k: free MBX IRQ before clearing interrupt scheme Jeff Kirsher
2016-04-05 8:01 ` [net-next 12/16] fm10k: add helper functions to set strings and data for ethtool stats Jeff Kirsher
2016-04-05 8:01 ` [net-next 13/16] fm10k: prevent possibly uninitialized variable Jeff Kirsher
2016-04-05 8:01 ` [net-next 14/16] fm10k: correctly clean up when init_queueing_scheme fails Jeff Kirsher
2016-04-05 8:01 ` [net-next 15/16] fm10k: fix a minor typo in some comments Jeff Kirsher
2016-04-05 8:01 ` [net-next 16/16] fm10k: use ethtool_rxfh_indir_default for default redirection table Jeff Kirsher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1459843288-40623-10-git-send-email-jeffrey.t.kirsher@intel.com \
--to=jeffrey.t.kirsher@intel.com \
--cc=davem@davemloft.net \
--cc=jacob.e.keller@intel.com \
--cc=jogreene@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=nhorman@redhat.com \
--cc=sassmann@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).