Merge 'misc-fixes' branch of master.kernel.org:/pub/scm/linux/kernel/…

…git/jgarzik/netdev-2.6
git-mirror · Jun 23, 2005 · 29c31a3 · 29c31a3
2 parents ee98689 + b2b3d82
commit 29c31a3
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
@@ -2307,6 +2307,7 @@ e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
 	tso = e1000_tso(adapter, skb);
 	if (tso < 0) {
 		dev_kfree_skb_any(skb);
+		spin_unlock_irqrestore(&adapter->tx_lock, flags);
 		return NETDEV_TX_OK;
 	}