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

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

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



This reverts commit 2d5d56df.

Upstream reported that other fixes are required after this, and asked
why it is really needed here.

So get those answers first before accepting this patch, as we can not
take known-buggy patches into the tree.

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

net/core/dev.c

+4 −5
Original line number Diff line number Diff line
@@ -5609,13 +5609,12 @@ 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(struct napi_struct *napi,

				    struct sk_buff *skb,

				    gro_result_t ret)

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

{

	switch (ret) {

	case GRO_NORMAL:

		gro_normal_one(napi, skb);

		if (netif_receive_skb_internal(skb))

			ret = GRO_DROP;

		break;



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


	skb_gro_reset_offset(skb);



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

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

	trace_napi_gro_receive_exit(ret);



	return ret;