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

Commit a8ee6865 authored by Vinicius Costa Gomes's avatar Vinicius Costa Gomes Committed by Greg Kroah-Hartman
Browse files

igc: Fix returning wrong statistics 



[ Upstream commit 6b7ed22ae4c96a415001f0c3116ebee15bb8491a ]

'igc_update_stats()' was not updating 'netdev->stats', so the returned
statistics, for example, requested by:

$ ip -s link show dev enp3s0

were not being updated and were always zero.

Fix by returning a set of statistics that are actually being
updated (adapter->stats64).

Fixes: c9a11c23 ("igc: Add netdev")
Signed-off-by: default avatarVinicius Costa Gomes <vinicius.gomes@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 81dcfdb9

drivers/net/ethernet/intel/igc/igc_main.c

+8 −6
Original line number Diff line number Diff line
@@ -2222,21 +2222,23 @@ static int igc_change_mtu(struct net_device *netdev, int new_mtu) 
}



/**

 * igc_get_stats - Get System Network Statistics

 * igc_get_stats64 - Get System Network Statistics

 * @netdev: network interface device structure

 * @stats: rtnl_link_stats64 pointer

 *

 * Returns the address of the device statistics structure.

 * The statistics are updated here and also from the timer callback.

 */

static struct net_device_stats *igc_get_stats(struct net_device *netdev)

static void igc_get_stats64(struct net_device *netdev,

			    struct rtnl_link_stats64 *stats)

{

	struct igc_adapter *adapter = netdev_priv(netdev);



	spin_lock(&adapter->stats64_lock);

	if (!test_bit(__IGC_RESETTING, &adapter->state))

		igc_update_stats(adapter);



	/* only return the current stats */

	return &netdev->stats;

	memcpy(stats, &adapter->stats64, sizeof(*stats));

	spin_unlock(&adapter->stats64_lock);

}



static netdev_features_t igc_fix_features(struct net_device *netdev,
@@ -3984,7 +3986,7 @@ static const struct net_device_ops igc_netdev_ops = { 
	.ndo_start_xmit		= igc_xmit_frame,

	.ndo_set_mac_address	= igc_set_mac,

	.ndo_change_mtu		= igc_change_mtu,

	.ndo_get_stats		= igc_get_stats,

	.ndo_get_stats64	= igc_get_stats64,

	.ndo_fix_features	= igc_fix_features,

	.ndo_set_features	= igc_set_features,

	.ndo_features_check	= igc_features_check,