diff options
| author | Jiri Slaby <jirislaby@gmail.com> | 2009-11-04 08:37:31 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-04 08:37:31 -0800 |
| commit | b8883a65be2d925ea82b14ca0068ce9a6c8bac1f (patch) | |
| tree | c36af0ecc39847845ee99e2ce8b75acc0386cefc | |
| parent | c6d14c84566d6b70ad9dc1618db0dec87cca9300 (diff) | |
| download | op-kernel-dev-b8883a65be2d925ea82b14ca0068ce9a6c8bac1f.zip op-kernel-dev-b8883a65be2d925ea82b14ca0068ce9a6c8bac1f.tar.gz | |
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>
| -rw-r--r-- | drivers/net/sungem.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c index 305ec3d..d6f4faf 100644 --- a/drivers/net/sungem.c +++ b/drivers/net/sungem.c @@ -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() */ |
