Commit f73fc403 authored by Eric Dumazet's avatar Eric Dumazet Committed by Jakub Kicinski
Browse files

ice: drop dead code in ice_receive_skb() 



napi_gro_receive() can never return GRO_DROP

GRO_DROP can only be returned from napi_gro_frags()
which is the other NAPI GRO entry point.

Followup patch will remove GRO_DROP, because drivers
are not supposed to call napi_gro_frags() if prior
napi_get_frags() has failed.

Note that I have left the gro_dropped variable. I leave to ice
maintainers the decision to further remove it from ethtool -S results.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Acked-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent efb5b338

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

+1 −6
Original line number Diff line number Diff line
@@ -191,12 +191,7 @@ ice_receive_skb(struct ice_ring *rx_ring, struct sk_buff *skb, u16 vlan_tag) 
	if ((rx_ring->netdev->features & NETIF_F_HW_VLAN_CTAG_RX) &&

	    (vlan_tag & VLAN_VID_MASK))

		__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vlan_tag);

	if (napi_gro_receive(&rx_ring->q_vector->napi, skb) == GRO_DROP) {

		/* this is tracked separately to help us debug stack drops */

		rx_ring->rx_stats.gro_dropped++;

		netdev_dbg(rx_ring->netdev, "Receive Queue %d: Dropped packet from GRO\n",

			   rx_ring->q_index);

	}

	napi_gro_receive(&rx_ring->q_vector->napi, skb);

}



/**