From 0e946be7cf6e2f549524ca0245a814b050fda0a0 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Fri, 10 Mar 2006 18:08:09 -0800
Subject: [PATCH] --- yaml --- r: 20995 b: refs/heads/master c:
 9e927fb6186b6913d47d33068160088a084d568e h: refs/heads/master i:   20993:
 ca8b9d9873570f9513ea07cad6d6f9b397784e66   20991:
 d2687a6199f374786d9e20952407885b26b64d5a v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/net/e1000/e1000_main.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 498d019f12e3..2c3ef1d82369 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ee33b7adc178dbeb16b4d8303ae3ab69a334518
+refs/heads/master: 9e927fb6186b6913d47d33068160088a084d568e
diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c
index 5b7d0f425af2..4c4db96d0b7b 100644
--- a/trunk/drivers/net/e1000/e1000_main.c
+++ b/trunk/drivers/net/e1000/e1000_main.c
@@ -2917,7 +2917,7 @@ e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
 			if (!__pskb_pull_tail(skb, pull_size)) {
 				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;
 		}