i40e: avoid double calling i40e_pf_rxq_wait()

[linux-2.6-microblaze.git] / drivers / net / ethernet / intel / i40e / i40e_main.c

diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 7a416e9..06078c4 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -4926,7 +4926,7 @@ int i40e_vsi_start_rings(struct i40e_vsi *vsi)
 void i40e_vsi_stop_rings(struct i40e_vsi *vsi)
 {
        struct i40e_pf *pf = vsi->back;
-       int pf_q, err, q_end;
+       int pf_q, q_end;
 
        /* When port TX is suspended, don't wait */
        if (test_bit(__I40E_PORT_SUSPENDED, vsi->back->state))
@@ -4936,16 +4936,10 @@ void i40e_vsi_stop_rings(struct i40e_vsi *vsi)
        for (pf_q = vsi->base_queue; pf_q < q_end; pf_q++)
                i40e_pre_tx_queue_cfg(&pf->hw, (u32)pf_q, false);
 
-       for (pf_q = vsi->base_queue; pf_q < q_end; pf_q++) {
-               err = i40e_control_wait_rx_q(pf, pf_q, false);
-               if (err)
-                       dev_info(&pf->pdev->dev,
-                                "VSI seid %d Rx ring %d disable timeout\n",
-                                vsi->seid, pf_q);
-       }
+       for (pf_q = vsi->base_queue; pf_q < q_end; pf_q++)
+               i40e_control_rx_q(pf, pf_q, false);
 
        msleep(I40E_DISABLE_TX_GAP_MSEC);
-       pf_q = vsi->base_queue;
        for (pf_q = vsi->base_queue; pf_q < q_end; pf_q++)
                wr32(&pf->hw, I40E_QTX_ENA(pf_q), 0);