Commit 51fe27e1 authored by Anirudh Venkataramanan's avatar Anirudh Venkataramanan Committed by Tony Nguyen
Browse files

ice: Remove rx_gro_dropped stat 



Tracking of the rx_gro_dropped statistic was removed in
commit f73fc403 ("ice: drop dead code in ice_receive_skb()").
Remove the associated variables and its reporting to ethtool stats.

Signed-off-by: default avatarAnirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: default avatarTony Brelinski <tonyx.brelinski@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent efc1eddb

drivers/net/ethernet/intel/ice/ice.h

+0 −1
Original line number Diff line number Diff line
@@ -265,7 +265,6 @@ struct ice_vsi { 
	u32 tx_busy;

	u32 rx_buf_failed;

	u32 rx_page_failed;

	u32 rx_gro_dropped;

	u16 num_q_vectors;

	u16 base_vector;		/* IRQ base for OS reserved vectors */

	enum ice_vsi_type type;

drivers/net/ethernet/intel/ice/ice_ethtool.c

+0 −1
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ static const struct ice_stats ice_gstrings_vsi_stats[] = { 
	ICE_VSI_STAT("rx_unknown_protocol", eth_stats.rx_unknown_protocol),

	ICE_VSI_STAT("rx_alloc_fail", rx_buf_failed),

	ICE_VSI_STAT("rx_pg_alloc_fail", rx_page_failed),

	ICE_VSI_STAT("rx_gro_dropped", rx_gro_dropped),

	ICE_VSI_STAT("tx_errors", eth_stats.tx_errors),

	ICE_VSI_STAT("tx_linearize", tx_linearize),

	ICE_VSI_STAT("tx_busy", tx_busy),

drivers/net/ethernet/intel/ice/ice_main.c

+1 −3
Original line number Diff line number Diff line
@@ -5354,7 +5354,6 @@ static void ice_update_vsi_ring_stats(struct ice_vsi *vsi) 
	vsi->tx_linearize = 0;

	vsi->rx_buf_failed = 0;

	vsi->rx_page_failed = 0;

	vsi->rx_gro_dropped = 0;



	rcu_read_lock();
@@ -5369,7 +5368,6 @@ static void ice_update_vsi_ring_stats(struct ice_vsi *vsi) 
		vsi_stats->rx_bytes += bytes;

		vsi->rx_buf_failed += ring->rx_stats.alloc_buf_failed;

		vsi->rx_page_failed += ring->rx_stats.alloc_page_failed;

		vsi->rx_gro_dropped += ring->rx_stats.gro_dropped;

	}



	/* update XDP Tx rings counters */
@@ -5401,7 +5399,7 @@ void ice_update_vsi_stats(struct ice_vsi *vsi) 
	ice_update_eth_stats(vsi);



	cur_ns->tx_errors = cur_es->tx_errors;

	cur_ns->rx_dropped = cur_es->rx_discards + vsi->rx_gro_dropped;

	cur_ns->rx_dropped = cur_es->rx_discards;

	cur_ns->tx_dropped = cur_es->tx_discards;

	cur_ns->multicast = cur_es->rx_multicast;

drivers/net/ethernet/intel/ice/ice_txrx.h

+0 −1
Original line number Diff line number Diff line
@@ -192,7 +192,6 @@ struct ice_rxq_stats { 
	u64 non_eop_descs;

	u64 alloc_page_failed;

	u64 alloc_buf_failed;

	u64 gro_dropped; /* GRO returned dropped */

};



enum ice_ring_state_t {