| commit | 29c31a3bf257e0723423f1f0f9afd1b840434c75 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | Thu Jun 23 09:25:04 2005 -0700 |
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | Thu Jun 23 09:25:04 2005 -0700 |
| tree | ff6d12f7854bb631e47a1483cb5220595aab00d0 | |
| parent | ee98689be1b054897ff17655008c3048fe88be94 [diff] | |
| parent | b2b3d8247951f298897b395599849957ee271c55 [diff] |
Merge 'misc-fixes' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
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; }