From 61e0759dc96c7686f240144728c1b1319cd8f2d9 Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jirislaby@gmail.com>
Date: Wed, 4 Nov 2009 08:37:31 -0800
Subject: [PATCH] --- yaml --- r: 171157 b: refs/heads/master c:
 b8883a65be2d925ea82b14ca0068ce9a6c8bac1f h: refs/heads/master i:   171155:
 ec813616d8bd3fa599ff014a45779faa719d47fd v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/net/sungem.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 7e06aefc15fb..5ad7f448805c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6d14c84566d6b70ad9dc1618db0dec87cca9300
+refs/heads/master: b8883a65be2d925ea82b14ca0068ce9a6c8bac1f
diff --git a/trunk/drivers/net/sungem.c b/trunk/drivers/net/sungem.c
index 305ec3d783db..d6f4faf5bbcb 100644
--- a/trunk/drivers/net/sungem.c
+++ b/trunk/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() */