ice: Remove rx_gro_dropped stat

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

Signed-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: Tony Brelinski <tonyx.brelinski@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/ice/ice.h b/drivers/net/ethernet/intel/ice/ice.h
index 02badaaf818c2507e5b9d7e0b66f192aaeab94b9..721afa0f0a88a02499cfdefdfd18e5af45077fae 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice.h
+++ b/drivers/net/ethernet/intel/ice/ice.h
@@ -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;

diff --git a/drivers/net/ethernet/intel/ice/ice_ethtool.c b/drivers/net/ethernet/intel/ice/ice_ethtool.c
index 4ca8d5880cfc2f7076e57f8972c4bf086f803750..51d3a929ecfdc2ab599bfee35a54c36b5a6345e8 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_ethtool.c
+++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c
@@ -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),

diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index 73dd272acbf91250531c4396f15847813e7d7d99..3c73ee4a6c0cb175f857b6eb98529d8ee8d661ca 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -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;
 

diff --git a/drivers/net/ethernet/intel/ice/ice_txrx.h b/drivers/net/ethernet/intel/ice/ice_txrx.h
index ffe0d271dec78ac79555c8ae9e714366eca2203d..701552d88beac9fe9f85b244f0e96f9e108fd048 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_txrx.h
+++ b/drivers/net/ethernet/intel/ice/ice_txrx.h
@@ -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 {