diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-23 12:25:04 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-23 12:25:04 -0400 |
| commit | 29c31a3bf257e0723423f1f0f9afd1b840434c75 (patch) | |
| tree | ff6d12f7854bb631e47a1483cb5220595aab00d0 /drivers/net | |
| parent | ee98689be1b054897ff17655008c3048fe88be94 (diff) | |
| parent | b2b3d8247951f298897b395599849957ee271c55 (diff) | |
Merge 'misc-fixes' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net')
| -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) | |||
| 2307 | tso = e1000_tso(adapter, skb); | 2307 | tso = e1000_tso(adapter, skb); |
| 2308 | if (tso < 0) { | 2308 | if (tso < 0) { |
| 2309 | dev_kfree_skb_any(skb); | 2309 | dev_kfree_skb_any(skb); |
| 2310 | spin_unlock_irqrestore(&adapter->tx_lock, flags); | ||
| 2310 | return NETDEV_TX_OK; | 2311 | return NETDEV_TX_OK; |
| 2311 | } | 2312 | } |
| 2312 | 2313 | ||