mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-30 13:38:40 +00:00
NET: sungem, use spin_trylock_irqsave
Use spin_trylock_irqsave instead of open-coded local_irq_save+spin_trylock. Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
c6d14c8456
commit
b8883a65be
@ -1033,10 +1033,8 @@ static netdev_tx_t gem_start_xmit(struct sk_buff *skb,
|
||||
(csum_stuff_off << 21));
|
||||
}
|
||||
|
||||
local_irq_save(flags);
|
||||
if (!spin_trylock(&gp->tx_lock)) {
|
||||
if (!spin_trylock_irqsave(&gp->tx_lock, flags)) {
|
||||
/* Tell upper layer to requeue */
|
||||
local_irq_restore(flags);
|
||||
return NETDEV_TX_LOCKED;
|
||||
}
|
||||
/* We raced with gem_do_stop() */
|
||||
|
Loading…
Reference in New Issue
Block a user