| commit | 749dfc70554f2c9e6624ac843d66571265ed9338 | [log] [tgz] |
|---|---|---|
| author | Jeff Garzik <jeff@garzik.org> | Sat Mar 11 13:35:31 2006 -0500 |
| committer | Jeff Garzik <jeff@garzik.org> | Sat Mar 11 13:35:31 2006 -0500 |
| tree | bf591255b3f158222f90852d53c4279e6e7e9ced | |
| parent | 74f5ec29ae93aa42c49f4285c20c457afe937881 [diff] [blame] | |
| parent | 0992a5d029181421877a716eaf99145828ff7eae [diff] [blame] |
Merge branch 'upstream-fixes'
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index 9adaf5f..0c631a7 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c
@@ -2815,7 +2815,7 @@ printk(KERN_ERR "__pskb_pull_tail failed.\n"); dev_kfree_skb_any(skb); - return -EFAULT; + return NETDEV_TX_OK; } len = skb->len - skb->data_len; break;