Commit 38f7b449 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-gro-gro_drop-deprecation' 

Eric Dumazet says:

====================
net-gro: GRO_DROP deprecation

GRO_DROP has no practical use and can be removed,
once ice driver is cleaned up.

This removes one useless conditional test in napi_gro_frags().
====================

Link: https://lore.kernel.org/r/20210108113903.3779510-1-eric.dumazet@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents efb5b338 1d11fa69

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);

}



/**

include/linux/netdevice.h

+0 −1
Original line number Diff line number Diff line
@@ -376,7 +376,6 @@ enum gro_result { 
	GRO_MERGED_FREE,

	GRO_HELD,

	GRO_NORMAL,

	GRO_DROP,

	GRO_CONSUMED,

};

typedef enum gro_result gro_result_t;

net/core/dev.c

+0 −11
Original line number Diff line number Diff line
@@ -6070,10 +6070,6 @@ static gro_result_t napi_skb_finish(struct napi_struct *napi, 
		gro_normal_one(napi, skb);

		break;



	case GRO_DROP:

		kfree_skb(skb);

		break;



	case GRO_MERGED_FREE:

		if (NAPI_GRO_CB(skb)->free == NAPI_GRO_FREE_STOLEN_HEAD)

			napi_skb_free_stolen_head(skb);
@@ -6158,10 +6154,6 @@ static gro_result_t napi_frags_finish(struct napi_struct *napi, 
			gro_normal_one(napi, skb);

		break;



	case GRO_DROP:

		napi_reuse_skb(napi, skb);

		break;



	case GRO_MERGED_FREE:

		if (NAPI_GRO_CB(skb)->free == NAPI_GRO_FREE_STOLEN_HEAD)

			napi_skb_free_stolen_head(skb);
@@ -6223,9 +6215,6 @@ gro_result_t napi_gro_frags(struct napi_struct *napi) 
	gro_result_t ret;

	struct sk_buff *skb = napi_frags_skb(napi);



	if (!skb)

		return GRO_DROP;



	trace_napi_gro_frags_entry(skb);



	ret = napi_frags_finish(napi, skb, dev_gro_receive(napi, skb));