diff --git a/[refs] b/[refs] index f35ef4d6a47f..c3656be82971 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1d214fa34fc7878d90e0963f9eb4895510db5e48 +refs/heads/master: 7505afe28c16a8d386624930a018d0052c75d687 diff --git a/trunk/drivers/net/ethernet/nvidia/forcedeth.c b/trunk/drivers/net/ethernet/nvidia/forcedeth.c index 5245dacc3a49..4c4e7f458383 100644 --- a/trunk/drivers/net/ethernet/nvidia/forcedeth.c +++ b/trunk/drivers/net/ethernet/nvidia/forcedeth.c @@ -2561,13 +2561,14 @@ static int nv_tx_done_optimized(struct net_device *dev, int limit) nv_tx_flip_ownership(dev); } - netdev_completed_queue(np->dev, tx_work, bytes_cleaned); - if (unlikely(np->get_tx.ex++ == np->last_tx.ex)) np->get_tx.ex = np->first_tx.ex; if (unlikely(np->get_tx_ctx++ == np->last_tx_ctx)) np->get_tx_ctx = np->first_tx_ctx; } + + netdev_completed_queue(np->dev, tx_work, bytes_cleaned); + if (unlikely((np->tx_stop == 1) && (np->get_tx.ex != orig_get_tx))) { np->tx_stop = 0; netif_wake_queue(dev);