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

Commit d4967cf3 authored by Yuval Mintz's avatar Yuval Mintz Committed by David S. Miller
Browse files

qed*: Align statistics names 



There's a difference in statsitics' names starting at qed and
propagating to qede, where egress counters indicate ranges while ingress
counters indiciate high-end.
Align all statistcs to follow the same conventions - name indicates range.

Signed-off-by: default avatarYuval Mintz <Yuval.Mintz@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 960a2628

drivers/net/ethernet/qlogic/qed/qed_l2.c

+10 −10
Original line number Original line Diff line number Diff line
@@ -1415,16 +1415,16 @@ static void __qed_get_vport_port_stats(struct qed_hwfn *p_hwfn, 
			sizeof(port_stats));

			sizeof(port_stats));





	p_stats->rx_64_byte_packets		+= port_stats.pmm.r64;

	p_stats->rx_64_byte_packets		+= port_stats.pmm.r64;

	p_stats->rx_127_byte_packets		+= port_stats.pmm.r127;

	p_stats->rx_65_to_127_byte_packets	+= port_stats.pmm.r127;

	p_stats->rx_255_byte_packets		+= port_stats.pmm.r255;

	p_stats->rx_128_to_255_byte_packets	+= port_stats.pmm.r255;

	p_stats->rx_511_byte_packets		+= port_stats.pmm.r511;

	p_stats->rx_256_to_511_byte_packets	+= port_stats.pmm.r511;

	p_stats->rx_1023_byte_packets		+= port_stats.pmm.r1023;

	p_stats->rx_512_to_1023_byte_packets	+= port_stats.pmm.r1023;

	p_stats->rx_1518_byte_packets		+= port_stats.pmm.r1518;

	p_stats->rx_1024_to_1518_byte_packets	+= port_stats.pmm.r1518;

	p_stats->rx_1522_byte_packets		+= port_stats.pmm.r1522;

	p_stats->rx_1519_to_1522_byte_packets	+= port_stats.pmm.r1522;

	p_stats->rx_2047_byte_packets		+= port_stats.pmm.r2047;

	p_stats->rx_1519_to_2047_byte_packets	+= port_stats.pmm.r2047;

	p_stats->rx_4095_byte_packets		+= port_stats.pmm.r4095;

	p_stats->rx_2048_to_4095_byte_packets	+= port_stats.pmm.r4095;

	p_stats->rx_9216_byte_packets		+= port_stats.pmm.r9216;

	p_stats->rx_4096_to_9216_byte_packets	+= port_stats.pmm.r9216;

	p_stats->rx_16383_byte_packets		+= port_stats.pmm.r16383;

	p_stats->rx_9217_to_16383_byte_packets	+= port_stats.pmm.r16383;

	p_stats->rx_crc_errors			+= port_stats.pmm.rfcs;

	p_stats->rx_crc_errors			+= port_stats.pmm.rfcs;

	p_stats->rx_mac_crtl_frames		+= port_stats.pmm.rxcf;

	p_stats->rx_mac_crtl_frames		+= port_stats.pmm.rxcf;

	p_stats->rx_pause_frames		+= port_stats.pmm.rxpf;

	p_stats->rx_pause_frames		+= port_stats.pmm.rxpf;

drivers/net/ethernet/qlogic/qede/qede.h

+10 −10
Original line number Original line Diff line number Diff line
@@ -59,16 +59,16 @@ struct qede_stats { 




	/* port */

	/* port */

	u64 rx_64_byte_packets;

	u64 rx_64_byte_packets;

	u64 rx_127_byte_packets;

	u64 rx_65_to_127_byte_packets;

	u64 rx_255_byte_packets;

	u64 rx_128_to_255_byte_packets;

	u64 rx_511_byte_packets;

	u64 rx_256_to_511_byte_packets;

	u64 rx_1023_byte_packets;

	u64 rx_512_to_1023_byte_packets;

	u64 rx_1518_byte_packets;

	u64 rx_1024_to_1518_byte_packets;

	u64 rx_1522_byte_packets;

	u64 rx_1519_to_1522_byte_packets;

	u64 rx_2047_byte_packets;

	u64 rx_1519_to_2047_byte_packets;

	u64 rx_4095_byte_packets;

	u64 rx_2048_to_4095_byte_packets;

	u64 rx_9216_byte_packets;

	u64 rx_4096_to_9216_byte_packets;

	u64 rx_16383_byte_packets;

	u64 rx_9217_to_16383_byte_packets;

	u64 rx_crc_errors;

	u64 rx_crc_errors;

	u64 rx_mac_crtl_frames;

	u64 rx_mac_crtl_frames;

	u64 rx_pause_frames;

	u64 rx_pause_frames;

drivers/net/ethernet/qlogic/qede/qede_ethtool.c

+10 −10
Original line number Original line Diff line number Diff line
@@ -59,16 +59,16 @@ static const struct { 
	QEDE_STAT(tx_bcast_pkts),

	QEDE_STAT(tx_bcast_pkts),





	QEDE_PF_STAT(rx_64_byte_packets),

	QEDE_PF_STAT(rx_64_byte_packets),

	QEDE_PF_STAT(rx_127_byte_packets),

	QEDE_PF_STAT(rx_65_to_127_byte_packets),

	QEDE_PF_STAT(rx_255_byte_packets),

	QEDE_PF_STAT(rx_128_to_255_byte_packets),

	QEDE_PF_STAT(rx_511_byte_packets),

	QEDE_PF_STAT(rx_256_to_511_byte_packets),

	QEDE_PF_STAT(rx_1023_byte_packets),

	QEDE_PF_STAT(rx_512_to_1023_byte_packets),

	QEDE_PF_STAT(rx_1518_byte_packets),

	QEDE_PF_STAT(rx_1024_to_1518_byte_packets),

	QEDE_PF_STAT(rx_1522_byte_packets),

	QEDE_PF_STAT(rx_1519_to_1522_byte_packets),

	QEDE_PF_STAT(rx_2047_byte_packets),

	QEDE_PF_STAT(rx_1519_to_2047_byte_packets),

	QEDE_PF_STAT(rx_4095_byte_packets),

	QEDE_PF_STAT(rx_2048_to_4095_byte_packets),

	QEDE_PF_STAT(rx_9216_byte_packets),

	QEDE_PF_STAT(rx_4096_to_9216_byte_packets),

	QEDE_PF_STAT(rx_16383_byte_packets),

	QEDE_PF_STAT(rx_9217_to_16383_byte_packets),

	QEDE_PF_STAT(tx_64_byte_packets),

	QEDE_PF_STAT(tx_64_byte_packets),

	QEDE_PF_STAT(tx_65_to_127_byte_packets),

	QEDE_PF_STAT(tx_65_to_127_byte_packets),

	QEDE_PF_STAT(tx_128_to_255_byte_packets),

	QEDE_PF_STAT(tx_128_to_255_byte_packets),

drivers/net/ethernet/qlogic/qede/qede_main.c

+19 −10
Original line number Original line Diff line number Diff line
@@ -1638,16 +1638,25 @@ void qede_fill_by_demand_stats(struct qede_dev *edev) 
	edev->stats.coalesced_bytes = stats.tpa_coalesced_bytes;

	edev->stats.coalesced_bytes = stats.tpa_coalesced_bytes;





	edev->stats.rx_64_byte_packets = stats.rx_64_byte_packets;

	edev->stats.rx_64_byte_packets = stats.rx_64_byte_packets;

	edev->stats.rx_127_byte_packets = stats.rx_127_byte_packets;

	edev->stats.rx_65_to_127_byte_packets = stats.rx_65_to_127_byte_packets;

	edev->stats.rx_255_byte_packets = stats.rx_255_byte_packets;

	edev->stats.rx_128_to_255_byte_packets =

	edev->stats.rx_511_byte_packets = stats.rx_511_byte_packets;

				stats.rx_128_to_255_byte_packets;

	edev->stats.rx_1023_byte_packets = stats.rx_1023_byte_packets;

	edev->stats.rx_256_to_511_byte_packets =

	edev->stats.rx_1518_byte_packets = stats.rx_1518_byte_packets;

				stats.rx_256_to_511_byte_packets;

	edev->stats.rx_1522_byte_packets = stats.rx_1522_byte_packets;

	edev->stats.rx_512_to_1023_byte_packets =

	edev->stats.rx_2047_byte_packets = stats.rx_2047_byte_packets;

				stats.rx_512_to_1023_byte_packets;

	edev->stats.rx_4095_byte_packets = stats.rx_4095_byte_packets;

	edev->stats.rx_1024_to_1518_byte_packets =

	edev->stats.rx_9216_byte_packets = stats.rx_9216_byte_packets;

				stats.rx_1024_to_1518_byte_packets;

	edev->stats.rx_16383_byte_packets = stats.rx_16383_byte_packets;

	edev->stats.rx_1519_to_1522_byte_packets =

				stats.rx_1519_to_1522_byte_packets;

	edev->stats.rx_1519_to_2047_byte_packets =

				stats.rx_1519_to_2047_byte_packets;

	edev->stats.rx_2048_to_4095_byte_packets =

				stats.rx_2048_to_4095_byte_packets;

	edev->stats.rx_4096_to_9216_byte_packets =

				stats.rx_4096_to_9216_byte_packets;

	edev->stats.rx_9217_to_16383_byte_packets =

				stats.rx_9217_to_16383_byte_packets;

	edev->stats.rx_crc_errors = stats.rx_crc_errors;

	edev->stats.rx_crc_errors = stats.rx_crc_errors;

	edev->stats.rx_mac_crtl_frames = stats.rx_mac_crtl_frames;

	edev->stats.rx_mac_crtl_frames = stats.rx_mac_crtl_frames;

	edev->stats.rx_pause_frames = stats.rx_pause_frames;

	edev->stats.rx_pause_frames = stats.rx_pause_frames;

include/linux/qed/qed_if.h

+10 −10
Original line number Original line Diff line number Diff line
@@ -384,16 +384,16 @@ struct qed_eth_stats { 




	/* port */

	/* port */

	u64	rx_64_byte_packets;

	u64	rx_64_byte_packets;

	u64	rx_127_byte_packets;

	u64	rx_65_to_127_byte_packets;

	u64	rx_255_byte_packets;

	u64	rx_128_to_255_byte_packets;

	u64	rx_511_byte_packets;

	u64	rx_256_to_511_byte_packets;

	u64	rx_1023_byte_packets;

	u64	rx_512_to_1023_byte_packets;

	u64	rx_1518_byte_packets;

	u64	rx_1024_to_1518_byte_packets;

	u64	rx_1522_byte_packets;

	u64	rx_1519_to_1522_byte_packets;

	u64	rx_2047_byte_packets;

	u64	rx_1519_to_2047_byte_packets;

	u64	rx_4095_byte_packets;

	u64	rx_2048_to_4095_byte_packets;

	u64	rx_9216_byte_packets;

	u64	rx_4096_to_9216_byte_packets;

	u64	rx_16383_byte_packets;

	u64	rx_9217_to_16383_byte_packets;

	u64	rx_crc_errors;

	u64	rx_crc_errors;

	u64	rx_mac_crtl_frames;

	u64	rx_mac_crtl_frames;

	u64	rx_pause_frames;

	u64	rx_pause_frames;