From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff Garzik Subject: [git patch] urgent e1000 fix Date: Thu, 23 Jun 2005 05:24:05 -0400 Message-ID: <42BA7FB5.5020804@pobox.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------010705020707050403070901" Cc: Linux Kernel , Netdev List Return-path: To: Andrew Morton , Linus Torvalds Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org This is a multi-part message in MIME format. --------------010705020707050403070901 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Please pull from 'misc-fixes' branch of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git to obtain the spinlock fix described in the attached text. --------------010705020707050403070901 Content-Type: text/plain; name="netdev-2.6.txt" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="netdev-2.6.txt" drivers/net/e1000/e1000_main.c | 1 + 1 files changed, 1 insertion(+) Mitch Williams: e1000: fix spinlock bug diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c --- 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, st tso = e1000_tso(adapter, skb); if (tso < 0) { dev_kfree_skb_any(skb); + spin_unlock_irqrestore(&adapter->tx_lock, flags); return NETDEV_TX_OK; } --------------010705020707050403070901--