| Message ID | 1257350818-4194-1-git-send-email-jirislaby@gmail.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Jiri Slaby <jirislaby@gmail.com> Date: Wed, 4 Nov 2009 17:06:58 +0100 > Use spin_trylock_irqsave instead of open-coded > local_irq_save+spin_trylock. > > Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c index 7019a0d..51bde03 100644 --- a/drivers/net/sungem.c +++ b/drivers/net/sungem.c @@ -1034,10 +1034,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() */
Use spin_trylock_irqsave instead of open-coded local_irq_save+spin_trylock. Impact: cleanup Signed-off-by: Jiri Slaby <jirislaby@gmail.com> --- drivers/net/sungem.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-)