Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cac4b22f authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by David S. Miller
Browse files

r8169: do not account fragments as packets 



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

Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 48addcc9

drivers/net/r8169.c

+3 −5
Original line number Diff line number Diff line
@@ -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;

		}