leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NET: sungem, use spin_trylock_irqsave

Browse Source 
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:
Jiri Slaby 2009-11-04 08:37:31 -08:00 committed by David S. Miller
parent c6d14c8456
commit b8883a65be
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/sungem.c
View File

@ -1033,10 +1033,8 @@ static netdev_tx_t gem_start_xmit(struct sk_buff *skb,
(csum_stuff_off << 21)); (csum_stuff_off << 21));
} }
local_irq_save(flags); if (!spin_trylock_irqsave(&gp->tx_lock, flags)) {
if (!spin_trylock(&gp->tx_lock)) {
/* Tell upper layer to requeue */ /* Tell upper layer to requeue */
local_irq_restore(flags);
return NETDEV_TX_LOCKED; return NETDEV_TX_LOCKED;
} }
/* We raced with gem_do_stop() */ /* We raced with gem_do_stop() */