From: Mitch Williams <mitch.a.williams@intel.com>
Date: Thu, 23 Jun 2005 07:41:00 +0000 (-0400)
Subject: e1000: fix spinlock bug
X-Git-Tag: v2.6.13-rc4~130^2~152^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b2b3d8247951f298897b395599849957ee271c55;p=linux-2.6-omap-h63xx.git

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>
---

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 325495b8b60..137226d98d4 100644
--- 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;
 	}