Commit 7505afe2 authored by Igor Maravic's avatar Igor Maravic Committed by David S. Miller

forcedeath: Fix bql support for forcedeath

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: default avatarIgor Maravic <igorm@etf.rs>
Acked-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1d214fa3
...@@ -2561,13 +2561,14 @@ static int nv_tx_done_optimized(struct net_device *dev, int limit) ...@@ -2561,13 +2561,14 @@ static int nv_tx_done_optimized(struct net_device *dev, int limit)
nv_tx_flip_ownership(dev); nv_tx_flip_ownership(dev);
} }
netdev_completed_queue(np->dev, tx_work, bytes_cleaned);
if (unlikely(np->get_tx.ex++ == np->last_tx.ex)) if (unlikely(np->get_tx.ex++ == np->last_tx.ex))
np->get_tx.ex = np->first_tx.ex; np->get_tx.ex = np->first_tx.ex;
if (unlikely(np->get_tx_ctx++ == np->last_tx_ctx)) if (unlikely(np->get_tx_ctx++ == np->last_tx_ctx))
np->get_tx_ctx = np->first_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))) { if (unlikely((np->tx_stop == 1) && (np->get_tx.ex != orig_get_tx))) {
np->tx_stop = 0; np->tx_stop = 0;
netif_wake_queue(dev); netif_wake_queue(dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment