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

Commit d2a5dca8 authored by Jian Shen's avatar Jian Shen Committed by David S. Miller
Browse files

net: hns3: Fix an error of total drop packet statistics 



The dropped tx/rx packets number of each tqp should also
be counted into the total drop tx/rx packets numbers.

Fixes: 76ad4f0e ("net: hns3: Add support of HNS3 Ethernet Driver for hip08 SoC")
Signed-off-by: default avatarJian Shen <shenjian15@huawei.com>
Signed-off-by: default avatarPeng Li <lipeng321@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b875cc37

drivers/net/ethernet/hisilicon/hns3/hns3_enet.c

+9 −2
Original line number Diff line number Diff line
@@ -1139,6 +1139,8 @@ hns3_nic_get_stats64(struct net_device *netdev, struct rtnl_link_stats64 *stats) 
	u64 rx_bytes = 0;

	u64 tx_pkts = 0;

	u64 rx_pkts = 0;

	u64 tx_drop = 0;

	u64 rx_drop = 0;



	if (test_bit(HNS3_NIC_STATE_DOWN, &priv->state))

		return;
@@ -1152,6 +1154,8 @@ hns3_nic_get_stats64(struct net_device *netdev, struct rtnl_link_stats64 *stats) 
			start = u64_stats_fetch_begin_irq(&ring->syncp);

			tx_bytes += ring->stats.tx_bytes;

			tx_pkts += ring->stats.tx_pkts;

			tx_drop += ring->stats.tx_busy;

			tx_drop += ring->stats.sw_err_cnt;

		} while (u64_stats_fetch_retry_irq(&ring->syncp, start));



		/* fetch the rx stats */
@@ -1160,6 +1164,9 @@ hns3_nic_get_stats64(struct net_device *netdev, struct rtnl_link_stats64 *stats) 
			start = u64_stats_fetch_begin_irq(&ring->syncp);

			rx_bytes += ring->stats.rx_bytes;

			rx_pkts += ring->stats.rx_pkts;

			rx_drop += ring->stats.non_vld_descs;

			rx_drop += ring->stats.err_pkt_len;

			rx_drop += ring->stats.l2_err;

		} while (u64_stats_fetch_retry_irq(&ring->syncp, start));

	}
@@ -1175,8 +1182,8 @@ hns3_nic_get_stats64(struct net_device *netdev, struct rtnl_link_stats64 *stats) 
	stats->rx_missed_errors = netdev->stats.rx_missed_errors;



	stats->tx_errors = netdev->stats.tx_errors;

	stats->rx_dropped = netdev->stats.rx_dropped;

	stats->tx_dropped = netdev->stats.tx_dropped;

	stats->rx_dropped = rx_drop + netdev->stats.rx_dropped;

	stats->tx_dropped = tx_drop + netdev->stats.tx_dropped;

	stats->collisions = netdev->stats.collisions;

	stats->rx_over_errors = netdev->stats.rx_over_errors;

	stats->rx_frame_errors = netdev->stats.rx_frame_errors;