Subject: [PATCH] e1000: Simple optimizations in e1000_xmit_frame

From: Krishna Kumar <[email-masked]>
Date: Tue, 08 May 2007 13:01:27 +0530

Some simple optimizations in e1000_xmit_frame.

Patch against net-2.6.22.git

Signed-off-by: Krishna Kumar <[email-masked]>
---
diff -ruNp org/drivers/net/e1000/e1000_main.c new/drivers/net/e1000/e1000_main.c
--- org/drivers/net/e1000/e1000_main.c	2007-04-09 12:40:02.000000000 +0530
+++ new/drivers/net/e1000/e1000_main.c	2007-04-09 12:42:28.000000000 +0530
@@ -3264,14 +3264,13 @@ e1000_xmit_frame(struct sk_buff *skb, st
 	unsigned int first, max_per_txd = E1000_MAX_DATA_PER_TXD;
 	unsigned int max_txd_pwr = E1000_MAX_TXD_PWR;
 	unsigned int tx_flags = 0;
-	unsigned int len = skb->len;
+	unsigned int len = skb->len - skb->data_len;
 	unsigned long flags;
-	unsigned int nr_frags = 0;
-	unsigned int mss = 0;
+	unsigned int nr_frags;
+	unsigned int mss;
 	int count = 0;
 	int tso;
 	unsigned int f;
-	len -= skb->data_len;
 
 	/* This goes back to the question of how to logically map a tx queue
 	 * to a flow.  Right now, performance is impacted slightly negatively
@@ -3305,7 +3304,7 @@ e1000_xmit_frame(struct sk_buff *skb, st
 		* points to just header, pull a few bytes of payload from
 		* frags into skb->data */
 		hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);
-		if (skb->data_len && (hdr_len == (skb->len - skb->data_len))) {
+		if (skb->data_len && hdr_len == len) {
 			switch (adapter->hw.mac_type) {
 				unsigned int pull_size;
 			case e1000_82544: