netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stanislaw Gruszka <sgruszka@redhat.com>
To: Francois Romieu <romieu@fr.zoreil.com>, netdev@vger.kernel.org
Cc: Denis Kirjanov <kirjanov@gmail.com>,
	Stanislaw Gruszka <sgruszka@redhat.com>
Subject: [PATCH 5/8] r8169: do not account fragments as packets
Date: Thu, 21 Oct 2010 10:25:40 +0200	[thread overview]
Message-ID: <1287649543-6569-6-git-send-email-sgruszka@redhat.com> (raw)
In-Reply-To: <1287649543-6569-1-git-send-email-sgruszka@redhat.com>

Only increase tx_{packets,dropped} statistics when transmit or drop
full skb, not just fragment.

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
--
 drivers/net/r8169.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 0a797d0..ef304c5 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -4094,10 +4094,10 @@ static void rtl8169_tx_clear_range(struct rtl8169_private *tp, u32 start,
 			rtl8169_unmap_tx_skb(&tp->pci_dev->dev, tx_skb,
 					     tp->TxDescArray + entry);
 			if (skb) {
+				tp->dev->stats.tx_dropped++;
 				dev_kfree_skb(skb);
 				tx_skb->skb = NULL;
 			}
-			tp->dev->stats.tx_dropped++;
 		}
 	}
 }
@@ -4402,7 +4402,6 @@ static void rtl8169_tx_interrupt(struct net_device *dev,
 	while (tx_left > 0) {
 		unsigned int entry = dirty_tx % NUM_TX_DESC;
 		struct ring_info *tx_skb = tp->tx_skb + entry;
-		u32 len = tx_skb->len;
 		u32 status;
 
 		rmb();
@@ -4410,12 +4409,11 @@ static void rtl8169_tx_interrupt(struct net_device *dev,
 		if (status & DescOwn)
 			break;
 
-		dev->stats.tx_bytes += len;
-		dev->stats.tx_packets++;
-
 		rtl8169_unmap_tx_skb(&tp->pci_dev->dev, tx_skb,
 				     tp->TxDescArray + entry);
 		if (status & LastFrag) {
+			dev->stats.tx_packets++;
+			dev->stats.tx_bytes += tx_skb->skb->len;
 			dev_kfree_skb(tx_skb->skb);
 			tx_skb->skb = NULL;
 		}
-- 
1.6.5.2


  parent reply	other threads:[~2010-10-21  8:23 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-10-21  8:25 [PATCH 0/8] r8169 patches for net-next v2 Stanislaw Gruszka
2010-10-21  8:25 ` [PATCH 1/8] r8169: check dma mapping failures Stanislaw Gruszka
2010-10-21  8:25 ` [PATCH 2/8] r8169: init rx ring cleanup Stanislaw Gruszka
2010-10-21  8:25 ` [PATCH 3/8] r8169: replace PCI_DMA_{TO,FROM}DEVICE to DMA_{TO,FROM}_DEVICE Stanislaw Gruszka
2010-10-21  8:25 ` [PATCH 4/8] r8169: use pointer to struct device as local variable Stanislaw Gruszka
2010-10-21  8:25 ` Stanislaw Gruszka [this message]
2010-10-21  8:25 ` [PATCH 6/8] r8169: changing mtu clean up Stanislaw Gruszka
2010-10-21  8:25 ` [PATCH 7/8] r8169: (re)init phy on resume Stanislaw Gruszka
2010-10-21  8:25 ` [PATCH 8/8] r8169: print errors when dma mapping fail Stanislaw Gruszka
2010-10-21  8:35 ` [PATCH 0/8] r8169 patches for net-next v2 David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1287649543-6569-6-git-send-email-sgruszka@redhat.com \
    --to=sgruszka@redhat.com \
    --cc=kirjanov@gmail.com \
    --cc=netdev@vger.kernel.org \
    --cc=romieu@fr.zoreil.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).