AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-28 11:18:45 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

i40e: remove extraneous loop in i40e_vsi_wait_queues_disabled

Browse Source 
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>
This commit is contained in:
Jacob Keller 2017-04-05 07:50:58 -04:00 committed by Jeff Kirsher
parent 41c4c2b50d
commit af26ce2dfb
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/ethernet/intel/i40e/i40e_main.c
View File

@ -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 * i40e_vsi_wait_queues_disabled - Wait for VSI's queues to be disabled
* @vsi: the VSI being configured * @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) 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; pf_q = vsi->base_queue;
for (i = 0; i < vsi->num_queue_pairs; i++, pf_q++) { 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); ret = i40e_pf_txq_wait(pf, pf_q, false);
if (ret) { if (ret) {
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
@ -4457,11 +4457,7 @@ static int i40e_vsi_wait_queues_disabled(struct i40e_vsi *vsi)
vsi->seid, pf_q); vsi->seid, pf_q);
return ret; return ret;
} }
} /* Check and wait for the Tx queue */
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 */
ret = i40e_pf_rxq_wait(pf, pf_q, false); ret = i40e_pf_rxq_wait(pf, pf_q, false);
if (ret) { if (ret) {
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,