Merge branch 'e1000-upstream' of git://198.78.49.142/linux-2.6

[powerpc.git] / drivers / net / e1000 / e1000_main.c

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 5f7e5c8..34d77ed 100644 (file)
--- 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)
                                        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;