fec: Invert the order of function calls in fec_restart()

Fabio Estevam · davem330 · commit 1ed0d56c1d5f · 2013-05-15T14:42:15.000-07:00
commit 54309fa ("net: fec: fix kernel oops when plug/unplug cable many times") introduced the following 'if' block in the beginning of fec_start(): if (netif_running(ndev)) { netif_device_detach(ndev); napi_disable(&fep->napi); netif_stop_queue(ndev); netif_tx_lock_bh(ndev); } Then later in the end of fec_restart() there is another block that calls the opposite of each one of these functions. The correct approach would be to also call them with in the reverse order, so that we have as result: if (netif_running(ndev)) { netif_tx_unlock_bh(ndev); netif_wake_queue(ndev); napi_enable(&fep->napi); netif_device_attach(ndev); } Suggested-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
@@ -616,10 +616,10 @@ fec_restart(struct net_device *ndev, int duplex)
 	writel(FEC_DEFAULT_IMASK, fep->hwp + FEC_IMASK);
 
 	if (netif_running(ndev)) {
-		netif_device_attach(ndev);
-		napi_enable(&fep->napi);
-		netif_wake_queue(ndev);
 		netif_tx_unlock_bh(ndev);
+		netif_wake_queue(ndev);
+		napi_enable(&fep->napi);
+		netif_device_attach(ndev);
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -616,10 +616,10 @@ fec_restart(struct net_device *ndev, int duplex)`
`616`	`616`	`writel(FEC_DEFAULT_IMASK, fep->hwp + FEC_IMASK);`
`617`	`617`
`618`	`618`	`if (netif_running(ndev)) {`
`619`		`- netif_device_attach(ndev);`
`620`		`- napi_enable(&fep->napi);`
`621`		`- netif_wake_queue(ndev);`
`622`	`619`	`netif_tx_unlock_bh(ndev);`
	`620`	`+ netif_wake_queue(ndev);`
	`621`	`+ napi_enable(&fep->napi);`
	`622`	`+ netif_device_attach(ndev);`
`623`	`623`	`}`
`624`	`624`	`}`
`625`	`625`