---

yaml --- r: 171157 b: refs/heads/master c: b8883a6 h: refs/heads/master i: 171155: ec81361 v: v3
git-mirror · Nov 4, 2009 · 61e0759 · 61e0759
1 parent 6c41222
commit 61e0759
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -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() */