Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c71302d6 authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

[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: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 35089bb2

drivers/net/tg3.c

+0 −4
Original line number Diff line number Diff line
@@ -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);

}