From: David S. Miller <davem@davemloft.net>
Date: Mon, 26 Apr 2021 19:00:00 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Tag: microblaze-v5.14~96^2~36
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=6876a18d3361e1893187970e1881a1d88d894d3f;p=linux-2.6-microblaze.git

Merge git://git./linux/kernel/git/netdev/net
---

6876a18d3361e1893187970e1881a1d88d894d3f
diff --cc net/core/dev.c
index eed028aec6a4,15fe36332fb8..222b1d322c96
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@@ -5964,9 -5910,11 +5964,9 @@@ static void gro_list_prepare(const stru
  				       maclen);
  		NAPI_GRO_CB(p)->same_flow = !diffs;
  	}
 -
 -	return head;
  }
  
- static void skb_gro_reset_offset(struct sk_buff *skb)
+ static inline void skb_gro_reset_offset(struct sk_buff *skb, u32 nhoff)
  {
  	const struct skb_shared_info *pinfo = skb_shinfo(skb);
  	const skb_frag_t *frag0 = &pinfo->frags[0];