forcedeath: Fix bql support for forcedeath
authorIgor Maravic <igorm@etf.rs>
Thu, 1 Dec 2011 23:48:20 +0000 (23:48 +0000)
committerDavid S. Miller <davem@davemloft.net>
Fri, 2 Dec 2011 17:39:12 +0000 (12:39 -0500)
Moved netdev_completed_queue() out of while loop in function nv_tx_done_optimized().
Because this function was in while loop,
BUG_ON(count > dql->num_queued - dql->num_completed)
was hit in dql_completed().

Signed-off-by: Igor Maravic <igorm@etf.rs>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/nvidia/forcedeth.c

index 5245dacc3a491e02825edf9ef313e12b4dd040bc..4c4e7f4583830ce9231bd1ebef8ab3a1fed99fa2 100644 (file)
@@ -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);