---

yaml --- r: 20995 b: refs/heads/master c: 9e927fb h: refs/heads/master i: 20993: ca8b9d9 20991: d2687a6 v: v3
git-mirror · Mar 11, 2006 · 0e946be · 0e946be
1 parent 69f4062
commit 0e946be
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;
 		}