diff options
author | Michael Chan <mchan@broadcom.com> | 2006-06-18 00:55:55 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2006-06-18 00:55:55 -0400 |
commit | c71302d61f844f766a44e1b04258086cc41f624e (patch) | |
tree | 678780353e025222ce87667466bba599c4c21d97 /drivers/net | |
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/net')
-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 3c9b13b3cf9b..542d4c3a10e5 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
@@ -2984,9 +2984,7 @@ static void tg3_tx_recover(struct tg3 *tp) | |||
2984 | "and include system chipset information.\n", tp->dev->name); | 2984 | "and include system chipset information.\n", tp->dev->name); |
2985 | 2985 | ||
2986 | spin_lock(&tp->lock); | 2986 | spin_lock(&tp->lock); |
2987 | spin_lock(&tp->tx_lock); | ||
2988 | tp->tg3_flags |= TG3_FLAG_TX_RECOVERY_PENDING; | 2987 | tp->tg3_flags |= TG3_FLAG_TX_RECOVERY_PENDING; |
2989 | spin_unlock(&tp->tx_lock); | ||
2990 | spin_unlock(&tp->lock); | 2988 | spin_unlock(&tp->lock); |
2991 | } | 2989 | } |
2992 | 2990 | ||
@@ -3429,12 +3427,10 @@ static inline void tg3_full_lock(struct tg3 *tp, int irq_sync) | |||
3429 | if (irq_sync) | 3427 | if (irq_sync) |
3430 | tg3_irq_quiesce(tp); | 3428 | tg3_irq_quiesce(tp); |
3431 | spin_lock_bh(&tp->lock); | 3429 | spin_lock_bh(&tp->lock); |
3432 | spin_lock(&tp->tx_lock); | ||
3433 | } | 3430 | } |
3434 | 3431 | ||
3435 | static inline void tg3_full_unlock(struct tg3 *tp) | 3432 | static inline void tg3_full_unlock(struct tg3 *tp) |
3436 | { | 3433 | { |
3437 | spin_unlock(&tp->tx_lock); | ||
3438 | spin_unlock_bh(&tp->lock); | 3434 | spin_unlock_bh(&tp->lock); |
3439 | } | 3435 | } |
3440 | 3436 | ||