From: Jesse Brandeburg <jesse.brandeburg@intel.com>
Date: Thu, 18 Jan 2007 17:25:31 +0000 (-0800)
Subject: e1000: tune our dynamic itr transmit packet accounting
X-Git-Tag: v2.6.21-rc2~42^2~11^2~109
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=7753b171c4e7604294060d4039214c8c8319bfca;p=~shefty%2Frdma-dev.git

e1000: tune our dynamic itr transmit packet accounting

The driver was still mis-calculating the number of bytes sent during
transmit, now the driver computes what appears to be exactly 100%
correct byte counts (not including CRC) when figuring out how many
bytes and frames were sent during the current transmit packet.
---

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 8c6c74d1284..ae76479d89d 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -4020,10 +4020,13 @@ e1000_clean_tx_irq(struct e1000_adapter *adapter,
 
 			if (cleaned) {
 				struct sk_buff *skb = buffer_info->skb;
-				unsigned int segs = skb_shinfo(skb)->gso_segs;
+				unsigned int segs, bytecount;
+				segs = skb_shinfo(skb)->gso_segs ?: 1;
+				/* multiply data chunks by size of headers */
+				bytecount = ((segs - 1) * skb_headlen(skb)) +
+				            skb->len;
 				total_tx_packets += segs;
-				total_tx_packets++;
-				total_tx_bytes += skb->len;
+				total_tx_bytes += bytecount;
 			}
 			e1000_unmap_and_free_tx_resource(adapter, buffer_info);
 			tx_desc->upper.data = 0;