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

Commit 97c71e3c authored by Jeff Kirsher's avatar Jeff Kirsher
Browse files

fm10k: Remove redundant rx_errors in ethtool 



Output of ethtool was reporting 2 rx_errors entries. This change
removes one of the redundant entries.

Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Acked-by: default avatarMatthew Vick <matthew.vick@intel.com>
Tested-by: default avatarKrishneil Singh <krishneil.k.singh@intel.com>
parent f4e25f6e

drivers/net/ethernet/intel/fm10k/fm10k.h

+1 −2
Original line number Diff line number Diff line 
/* Intel Ethernet Switch Host Interface Driver

 * Copyright(c) 2013 - 2014 Intel Corporation.

 * Copyright(c) 2013 - 2015 Intel Corporation.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,
@@ -266,7 +266,6 @@ struct fm10k_intfc { 
	u64 tx_csum_errors;

	u64 alloc_failed;

	u64 rx_csum_errors;

	u64 rx_errors;



	u64 tx_bytes_nic;

	u64 tx_packets_nic;

drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c

+1 −2
Original line number Diff line number Diff line 
/* Intel Ethernet Switch Host Interface Driver

 * Copyright(c) 2013 - 2014 Intel Corporation.

 * Copyright(c) 2013 - 2015 Intel Corporation.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,
@@ -63,7 +63,6 @@ static const struct fm10k_stats fm10k_gstrings_stats[] = { 
	FM10K_STAT("tx_csum_errors", tx_csum_errors),

	FM10K_STAT("rx_alloc_failed", alloc_failed),

	FM10K_STAT("rx_csum_errors", rx_csum_errors),

	FM10K_STAT("rx_errors", rx_errors),



	FM10K_STAT("tx_packets_nic", tx_packets_nic),

	FM10K_STAT("tx_bytes_nic", tx_bytes_nic),

drivers/net/ethernet/intel/fm10k/fm10k_pci.c

+2 −3
Original line number Diff line number Diff line 
/* Intel Ethernet Switch Host Interface Driver

 * Copyright(c) 2013 - 2014 Intel Corporation.

 * Copyright(c) 2013 - 2015 Intel Corporation.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,
@@ -357,7 +357,6 @@ void fm10k_update_stats(struct fm10k_intfc *interface) 
	net_stats->rx_packets = pkts;

	interface->alloc_failed = alloc_failed;

	interface->rx_csum_errors = rx_csum_errors;

	interface->rx_errors = rx_errors;



	hw->mac.ops.update_hw_stats(hw, &interface->stats);
@@ -378,7 +377,7 @@ void fm10k_update_stats(struct fm10k_intfc *interface) 
	interface->rx_drops_nic = rx_drops_nic;



	/* Fill out the OS statistics structure */

	net_stats->rx_errors = interface->stats.xec.count;

	net_stats->rx_errors = rx_errors;

	net_stats->rx_dropped = interface->stats.nodesc_drop.count;

}