From 9f9b44b41b9464e46e680d4f0d5d1a61fb1aef82 Mon Sep 17 00:00:00 2001 From: Auke Kok Date: Tue, 27 Jun 2006 09:06:49 -0700 Subject: [PATCH] --- yaml --- r: 32175 b: refs/heads/master c: a5eafce2ce2fd3a1956657d85908ca691b870e5d h: refs/heads/master i: 32173: 482b9a5bb2cb002242f8102c65e8108fdc725be1 32171: 37673389fa1bb7343aa5e17c8f4fbfe723a018e0 32167: 64bcac41ae48f4d9fb798a01e9031d3fcd1dff24 32159: 2ae86baeee7586ee848cbf517b318809d5d029c2 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 3a1fff6bdd67..6da70d11d670 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9a53a2029885e0088e9149679215b95d04deb57b +refs/heads/master: a5eafce2ce2fd3a1956657d85908ca691b870e5d diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c index ea18f3085f69..fc39cbcee2bc 100644 --- a/trunk/drivers/net/e1000/e1000_main.c +++ b/trunk/drivers/net/e1000/e1000_main.c @@ -2841,7 +2841,7 @@ e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev) case e1000_82573: pull_size = min((unsigned int)4, skb->data_len); if (!__pskb_pull_tail(skb, pull_size)) { - printk(KERN_ERR + DPRINTK(DRV, ERR, "__pskb_pull_tail failed.\n"); dev_kfree_skb_any(skb); return NETDEV_TX_OK;