From: Auke Kok <auke\-jan.h.kok@intel.com>
Date: Wed, 1 Nov 2006 16:47:50 +0000 (-0800)
Subject: e1000: simplify skb_put call.
X-Git-Tag: v2.6.20-rc2~6^2~13^2~468^2~82
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=996695de21b9b301ebb32379e2950fc2142df3a7;p=linux-2.6-omap-h63xx.git

e1000: simplify skb_put call.

Simplify two calls to skb_put by removing one call to it.

Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
---

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 681b738c6da..44ba52229c7 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/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,