Skip to content

Commit

Permalink
sfc: When waking a stopped tx_queue, only lock that tx_queue
Browse files Browse the repository at this point in the history
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Steve Hodgson authored and David S. Miller committed Dec 3, 2010
1 parent 78d4189 commit 4f3907e
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions drivers/net/sfc/tx.c
Original file line number Diff line number Diff line change
Expand Up @@ -401,6 +401,7 @@ void efx_xmit_done(struct efx_tx_queue *tx_queue, unsigned int index)
{
unsigned fill_level;
struct efx_nic *efx = tx_queue->efx;
struct netdev_queue *queue;

EFX_BUG_ON_PARANOID(index > tx_queue->ptr_mask);

Expand All @@ -417,12 +418,15 @@ void efx_xmit_done(struct efx_tx_queue *tx_queue, unsigned int index)

/* Do this under netif_tx_lock(), to avoid racing
* with efx_xmit(). */
netif_tx_lock(efx->net_dev);
queue = netdev_get_tx_queue(
efx->net_dev,
tx_queue->queue / EFX_TXQ_TYPES);
__netif_tx_lock(queue, smp_processor_id());
if (tx_queue->stopped) {
tx_queue->stopped = 0;
efx_wake_queue(tx_queue->channel);
}
netif_tx_unlock(efx->net_dev);
__netif_tx_unlock(queue);
}
}
}
Expand Down

0 comments on commit 4f3907e

Please sign in to comment.