commit b2b3d8247951f298897b395599849957ee271c55
author Mitch Williams <mitch.a.williams@intel.com> Thu Jun 23 03:41:00 2005 -0400
committer Jeff Garzik <jgarzik@pobox.com> Thu Jun 23 03:41:00 2005 -0400
tree e6e5f7698d06d83e861210e6cf427ce3262d78fc
parent a4936044001694f033fe4ea94d6034d51a6b465c

e1000: fix spinlock bug

This patch fixes an obvious and nasty bug where we could exit the transmit
routine while holding tx_lock.

Signed-off-by:  Mitch Williams <mitch.a.williams@intel.com>

drivers/net/e1000/e1000_main.c

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 325495b..137226d 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -2307,6 +2307,7 @@
 	tso = e1000_tso(adapter, skb);
 	if (tso < 0) {
 		dev_kfree_skb_any(skb);
+		spin_unlock_irqrestore(&adapter->tx_lock, flags);
 		return NETDEV_TX_OK;
 	}