From 1274413bff05dd28c1b7d089e2733d559f69b0b9 Mon Sep 17 00:00:00 2001
From: Auke Kok <auke-jan.h.kok@intel.com>
Date: Tue, 18 Apr 2006 12:31:04 -0700
Subject: [PATCH] --- yaml --- r: 27247 b: refs/heads/master c:
 1cb5821f444cadbe94453282f9f4767cf8744a8e h: refs/heads/master i:   27245:
 724a400e2b5b037a5d101aac0bb75ddfc2a5bd88   27243:
 35ce7b8a9ed250fb0e05d3adb9e6a6a4fb71d87d   27239:
 c2feedb458a0e27710d1e96ad5b992a556a51c95   27231:
 60ae00e79de8120df510a54a809768d1beb7f9c3 v: v3

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

diff --git a/[refs] b/[refs]
index 43b55cd6743a..55cec4e7a7fe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc86d32ab51c4ad3086472457fb90b61249d91f5
+refs/heads/master: 1cb5821f444cadbe94453282f9f4767cf8744a8e
diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c
index 2b8bced0cf64..fb8cef619142 100644
--- a/trunk/drivers/net/e1000/e1000_main.c
+++ b/trunk/drivers/net/e1000/e1000_main.c
@@ -3585,8 +3585,7 @@ e1000_clean_rx_irq(struct e1000_adapter *adapter,
 				buffer_info->skb = skb;
 				goto next_desc;
 			}
-		} else
-			skb_put(skb, length);
+		}
 
 		/* code added for copybreak, this should improve
 		 * performance for small packets with large amounts