diff options
| author |   Mugunthan V N <mugunthanvnm@ti.com> | 2012-11-14 09:07:57 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2012-11-14 22:09:06 -0500 |
| commit | 71380f9bb18200ec65ddd2ef117410d1229e2de2 (patch) | |
| tree | 73fb5daa9c6a1e86a342d5e365c24e2bb71cd210 /drivers/net/ethernet/ti | |
| parent | cpsw: simplify the setup of the register pointers (diff) | |
| download | linux-dev-71380f9bb18200ec65ddd2ef117410d1229e2de2.tar.xz linux-dev-71380f9bb18200ec65ddd2ef117410d1229e2de2.zip | |
net: cpsw: halt network stack before halting the device during suspend
Move network stack halt APIs before halting the hardware to ensure no
packets are queued to hardware during closing the device during
suspend sequence.
Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Acked-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/ti')
| -rw-r--r-- | drivers/net/ethernet/ti/cpsw.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index 0da9c753c567..02c24777e23b 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -698,12 +698,12 @@ static int cpsw_ndo_stop(struct net_device *ndev) struct cpsw_priv *priv = netdev_priv(ndev); cpsw_info(priv, ifdown, "shutting down cpsw device\n"); - cpsw_intr_disable(priv); - cpdma_ctlr_int_ctrl(priv->dma, false); - cpdma_ctlr_stop(priv->dma); netif_stop_queue(priv->ndev); napi_disable(&priv->napi); netif_carrier_off(priv->ndev); + cpsw_intr_disable(priv); + cpdma_ctlr_int_ctrl(priv->dma, false); + cpdma_ctlr_stop(priv->dma); cpsw_ale_stop(priv->ale); for_each_slave(priv, cpsw_slave_stop, priv); pm_runtime_put_sync(&priv->pdev->dev); |