diff options
| author | Michael Chan <mchan@broadcom.com> | 2006-06-17 21:55:55 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-06-17 21:55:55 -0700 |
| commit | c71302d61f844f766a44e1b04258086cc41f624e (patch) | |
| tree | 678780353e025222ce87667466bba599c4c21d97 /drivers | |
| parent | 35089bb203f44e33b6bbb6c4de0b0708f9a48921 (diff) | |
[TG3]: Remove unnecessary tx_lock
Remove tx_lock where it is unnecessary. tg3 runs lockless and so it
requires interrupts to be disabled and sync'ed, netif_queue and NAPI
poll to be stopped before the device can be reconfigured. After
stopping everything, it is no longer necessary to get the tx_lock.
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/tg3.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 3c9b13b3cf9..542d4c3a10e 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -2984,9 +2984,7 @@ static void tg3_tx_recover(struct tg3 *tp) "and include system chipset information.\n", tp->dev->name); spin_lock(&tp->lock); - spin_lock(&tp->tx_lock); tp->tg3_flags |= TG3_FLAG_TX_RECOVERY_PENDING; - spin_unlock(&tp->tx_lock); spin_unlock(&tp->lock); } @@ -3429,12 +3427,10 @@ static inline void tg3_full_lock(struct tg3 *tp, int irq_sync) if (irq_sync) tg3_irq_quiesce(tp); spin_lock_bh(&tp->lock); - spin_lock(&tp->tx_lock); } static inline void tg3_full_unlock(struct tg3 *tp) { - spin_unlock(&tp->tx_lock); spin_unlock_bh(&tp->lock); } |