---

yaml --- r: 41484 b: refs/heads/master c: 996695d h: refs/heads/master v: v3
git-mirror · Dec 2, 2006 · 08784d1 · 08784d1
1 parent dad39c4
commit 08784d1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2bc35c1078fdfe7bb2a849c2d1bee8d9d5fea4a7
+refs/heads/master: 996695de21b9b301ebb32379e2950fc2142df3a7
diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c
@@ -3842,12 +3842,11 @@ e1000_clean_rx_irq(struct e1000_adapter *adapter,
 				/* save the skb in buffer_info as good */
 				buffer_info->skb = skb;
 				skb = new_skb;
-				skb_put(skb, length);
 			}
-		} else
-			skb_put(skb, length);
-
+			/* else just continue with the old one */
+		}
 		/* end copybreak code */
+		skb_put(skb, length);
 
 		/* Receive Checksum Offload */
 		e1000_rx_checksum(adapter,