diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-23 18:25:04 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-23 18:25:04 +0200 |
| commit | 29c31a3bf257e0723423f1f0f9afd1b840434c75 (patch) | |
| tree | ff6d12f7854bb631e47a1483cb5220595aab00d0 | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6 (diff) | |
| parent | e1000: fix spinlock bug (diff) | |
| download | linux-29c31a3bf257e0723423f1f0f9afd1b840434c75.tar.xz linux-29c31a3bf257e0723423f1f0f9afd1b840434c75.zip | |
Merge 'misc-fixes' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
| -rw-r--r-- | drivers/net/e1000/e1000_main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index 325495b8b60c..137226d98d47 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; } |