From 6f2d211d470015daec70bdf4b6292101f45532ba Mon Sep 17 00:00:00 2001 From: Steve Hodgson Date: Thu, 2 Dec 2010 13:48:14 +0000 Subject: [PATCH] --- yaml --- r: 224774 b: refs/heads/master c: 4f3907e9a600a46d8c946469ce6636080310d12e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/sfc/tx.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 90a8c5edbf4d..86e6a79fbc91 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 78d4189d6b000898db2d9a9d745468f1322cbc71 +refs/heads/master: 4f3907e9a600a46d8c946469ce6636080310d12e diff --git a/trunk/drivers/net/sfc/tx.c b/trunk/drivers/net/sfc/tx.c index 11726989fe2d..03194f7c0954 100644 --- a/trunk/drivers/net/sfc/tx.c +++ b/trunk/drivers/net/sfc/tx.c @@ -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); @@ -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); } } }