| Message ID | 4BDEDB50.7000707@ring3k.org |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Mike McCormack <mikem@ring3k.org> Date: Mon, 03 May 2010 23:18:56 +0900 > netif_stop_queue does not ensure all in-progress transmits are complete, > so use netif_tx_disable() instead. > > Make sure NAPI polls are disabled, otherwise NAPI might trigger a TX > restart between when we stop the queue and NAPI is disabled. > > Signed-off-by: Mike McCormack <mikem@ring3k.org> This looks quite reasonable, Stephen please review. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 088c797..b839bae 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c @@ -2236,8 +2236,8 @@ static int sky2_change_mtu(struct net_device *dev, int new_mtu) sky2_write32(hw, B0_IMSK, 0); dev->trans_start = jiffies; /* prevent tx timeout */ - netif_stop_queue(dev); napi_disable(&hw->napi); + netif_tx_disable(dev); synchronize_irq(hw->pdev->irq);
netif_stop_queue does not ensure all in-progress transmits are complete, so use netif_tx_disable() instead. Make sure NAPI polls are disabled, otherwise NAPI might trigger a TX restart between when we stop the queue and NAPI is disabled. Signed-off-by: Mike McCormack <mikem@ring3k.org> --- drivers/net/sky2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)