diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-11 13:35:31 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-11 13:35:31 -0500 |
| commit | 749dfc70554f2c9e6624ac843d66571265ed9338 (patch) | |
| tree | bf591255b3f158222f90852d53c4279e6e7e9ced /drivers/net/e1000 | |
| parent | 74f5ec29ae93aa42c49f4285c20c457afe937881 (diff) | |
| parent | 0992a5d029181421877a716eaf99145828ff7eae (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'drivers/net/e1000')
| -rw-r--r-- | drivers/net/e1000/e1000_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index 9adaf5fa9d48..0c631a77ccf6 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c | |||
| @@ -2815,7 +2815,7 @@ e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev) | |||
| 2815 | printk(KERN_ERR | 2815 | printk(KERN_ERR |
| 2816 | "__pskb_pull_tail failed.\n"); | 2816 | "__pskb_pull_tail failed.\n"); |
| 2817 | dev_kfree_skb_any(skb); | 2817 | dev_kfree_skb_any(skb); |
| 2818 | return -EFAULT; | 2818 | return NETDEV_TX_OK; |
| 2819 | } | 2819 | } |
| 2820 | len = skb->len - skb->data_len; | 2820 | len = skb->len - skb->data_len; |
| 2821 | break; | 2821 | break; |