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

Commit 54d9896c authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "Revert "BACKPORT: net: core: use listified Rx for GRO_NORMAL in napi_gro_receive()"" 



This reverts commit a81a6940 as it is needed, and is in the upstream 5.4.y tree now.

Bug: 167477898
Change-Id: Ica5a915027546a7f6f655c336db2489897b007f0
Cc: Hyunsoon Kim <h10.kim@samsung.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent 1869fba8

net/core/dev.c

+5 −4
Original line number Diff line number Diff line
@@ -5609,12 +5609,13 @@ static void napi_skb_free_stolen_head(struct sk_buff *skb) 
	kmem_cache_free(skbuff_head_cache, skb);

}



static gro_result_t napi_skb_finish(gro_result_t ret, struct sk_buff *skb)

static gro_result_t napi_skb_finish(struct napi_struct *napi,

				    struct sk_buff *skb,

				    gro_result_t ret)

{

	switch (ret) {

	case GRO_NORMAL:

		if (netif_receive_skb_internal(skb))

			ret = GRO_DROP;

		gro_normal_one(napi, skb);

		break;



	case GRO_DROP:
@@ -5646,7 +5647,7 @@ gro_result_t napi_gro_receive(struct napi_struct *napi, struct sk_buff *skb) 


	skb_gro_reset_offset(skb);



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

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

	trace_napi_gro_receive_exit(ret);



	return ret;