|
@@ -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;
|
|
}
|
|
}
|
|
- }
|
|
|
|
-
|
|
|
|
- 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);
|
|
ret = i40e_pf_rxq_wait(pf, pf_q, false);
|
|
if (ret) {
|
|
if (ret) {
|
|
dev_info(&pf->pdev->dev,
|
|
dev_info(&pf->pdev->dev,
|