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 07/12] i40e: remove extraneous loop in i40e_vsi_wait_queues_disabled
Date: Sat, 8 Apr 2017 02:55:48 -0700 [thread overview]
Message-ID: <20170408095553.78307-8-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <20170408095553.78307-1-jeffrey.t.kirsher@intel.com>
From: Jacob Keller <jacob.e.keller@intel.com>
We can simply check both Tx and Rx queues in a single loop, rather than
repeating the loop twice.
Change-ID: Ic06f26b0e3c2620e0e33c1a2999edda488e647ad
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/i40e/i40e_main.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 2111f120865a..0e1240b704ef 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -4440,7 +4440,7 @@ static void i40e_pf_unquiesce_all_vsi(struct i40e_pf *pf)
* i40e_vsi_wait_queues_disabled - Wait for VSI's queues to be disabled
* @vsi: the VSI being configured
*
- * This function waits for the given VSI's queues to be disabled.
+ * Wait until all queues on a given VSI have been disabled.
**/
static int i40e_vsi_wait_queues_disabled(struct i40e_vsi *vsi)
{
@@ -4449,7 +4449,7 @@ static int i40e_vsi_wait_queues_disabled(struct i40e_vsi *vsi)
pf_q = vsi->base_queue;
for (i = 0; i < vsi->num_queue_pairs; i++, pf_q++) {
- /* Check and wait for the disable status of the queue */
+ /* Check and wait for the Tx queue */
ret = i40e_pf_txq_wait(pf, pf_q, false);
if (ret) {
dev_info(&pf->pdev->dev,
@@ -4457,11 +4457,7 @@ static int i40e_vsi_wait_queues_disabled(struct i40e_vsi *vsi)
vsi->seid, pf_q);
return ret;
}
- }
-
- pf_q = vsi->base_queue;
- for (i = 0; i < vsi->num_queue_pairs; i++, pf_q++) {
- /* Check and wait for the disable status of the queue */
+ /* Check and wait for the Tx queue */
ret = i40e_pf_rxq_wait(pf, pf_q, false);
if (ret) {
dev_info(&pf->pdev->dev,
--
2.12.2
next prev parent reply other threads:[~2017-04-08 9:56 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-08 9:55 [net-next 00/12][pull request] 40GbE Intel Wired LAN Driver Updates 2017-04-08 Jeff Kirsher
2017-04-08 9:55 ` [net-next 01/12] i40e: only register client on iWarp-capable devices Jeff Kirsher
2017-04-08 9:55 ` [net-next 02/12] i40e: update error message when trying to add invalid filters Jeff Kirsher
2017-04-08 9:55 ` [net-next 03/12] i40e: Swap use of pf->flags and pf->hw_disabled_flags for ATR Eviction Jeff Kirsher
2017-04-08 9:55 ` [net-next 04/12] i40e: Decrease the scope of rtnl lock Jeff Kirsher
2017-04-08 9:55 ` [net-next 05/12] i40e: Simplify i40e_detect_recover_hung_queue logic Jeff Kirsher
2017-04-08 9:55 ` [net-next 06/12] i40e: allow look-up of MAC address from Open Firmware or IDPROM Jeff Kirsher
2017-04-08 9:55 ` Jeff Kirsher [this message]
2017-04-08 9:55 ` [net-next 08/12] i40e: remove I40E_FLAG_NEED_LINK_UPDATE Jeff Kirsher
2017-04-08 9:55 ` [net-next 09/12] i40e: clean up historic deprecated flag definitions Jeff Kirsher
2017-04-08 9:55 ` [net-next 10/12] i40e/i40evf: Add support for using order 1 pages with a 3K buffer Jeff Kirsher
2017-04-08 9:55 ` [net-next 11/12] i40e/i40evf: Add support for padding start of frames Jeff Kirsher
2017-04-08 9:55 ` [net-next 12/12] i40e/i40evf: Use build_skb to build frames Jeff Kirsher
2017-04-09 20:41 ` [net-next 00/12][pull request] 40GbE Intel Wired LAN Driver Updates 2017-04-08 David Miller
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=20170408095553.78307-8-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).