From 8c07e6046d23dec92817170773d4c973973aea3c Mon Sep 17 00:00:00 2001 From: Jesse Brandeburg Date: Thu, 18 Jan 2007 09:25:31 -0800 Subject: [PATCH] --- yaml --- r: 46491 b: refs/heads/master c: 7753b171c4e7604294060d4039214c8c8319bfca h: refs/heads/master i: 46489: 1d6da3d399479491e067e01ceb614afc84f693cf 46487: 82f7ce9506a86b066ce32a54e6ce79b0f9db97b0 v: v3 --- [refs] | 2 +- trunk/drivers/net/e1000/e1000_main.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c6e04c9f6300..e07f8497f401 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f6c57bafcdebed4429cdda206149ddcbb1d46e91 +refs/heads/master: 7753b171c4e7604294060d4039214c8c8319bfca diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c index 8c6c74d1284a..ae76479d89d1 100644 --- a/trunk/drivers/net/e1000/e1000_main.c +++ b/trunk/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;