---

yaml --- r: 189503 b: refs/heads/master c: ce6fbde h: refs/heads/master i: 189501: c9dfc56 189499: 3d616a4 189495: a17a7fb 189487: b61356a 189471: ab240d5 189439: 0cbc772 v: v3
git-mirror · Mar 31, 2010 · fe48e1c · fe48e1c
1 parent d33b39a
commit fe48e1c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ddc01b3b8ab224b346daf61976078b166f36b7e8
+refs/heads/master: ce6fbdefb68d46db88170494b277551f955b48e2
diff --git a/trunk/drivers/net/sgiseeq.c b/trunk/drivers/net/sgiseeq.c
@@ -592,8 +592,10 @@ static int sgiseeq_start_xmit(struct sk_buff *skb, struct net_device *dev)
 	/* Setup... */
 	len = skb->len;
 	if (len < ETH_ZLEN) {
-		if (skb_padto(skb, ETH_ZLEN))
+		if (skb_padto(skb, ETH_ZLEN)) {
+			spin_unlock_irqrestore(&sp->tx_lock, flags);
 			return NETDEV_TX_OK;
+		}
 		len = ETH_ZLEN;
 	}