From: David S. Miller <davem@davemloft.net>
Date: Wed, 10 Feb 2021 21:30:12 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Tag: v5.15~1802^2~105
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dc9d87581d464e7b7d38853d6904b70b6c920d99;p=platform%2Fkernel%2Flinux-starfive.git

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

dc9d87581d464e7b7d38853d6904b70b6c920d99
diff --cc include/soc/mscc/ocelot.h
index d0d48e9,c34b9cc..bfce3df
--- a/include/soc/mscc/ocelot.h
+++ b/include/soc/mscc/ocelot.h
@@@ -758,11 -738,12 +759,12 @@@ int ocelot_get_sset_count(struct ocelo
  int ocelot_get_ts_info(struct ocelot *ocelot, int port,
  		       struct ethtool_ts_info *info);
  void ocelot_set_ageing_time(struct ocelot *ocelot, unsigned int msecs);
+ int ocelot_port_flush(struct ocelot *ocelot, int port);
  void ocelot_adjust_link(struct ocelot *ocelot, int port,
  			struct phy_device *phydev);
 -int ocelot_port_vlan_filtering(struct ocelot *ocelot, int port, bool enabled,
 -			       struct switchdev_trans *trans);
 +int ocelot_port_vlan_filtering(struct ocelot *ocelot, int port, bool enabled);
  void ocelot_bridge_stp_state_set(struct ocelot *ocelot, int port, u8 state);
 +void ocelot_apply_bridge_fwd_mask(struct ocelot *ocelot);
  int ocelot_port_bridge_join(struct ocelot *ocelot, int port,
  			    struct net_device *bridge);
  int ocelot_port_bridge_leave(struct ocelot *ocelot, int port,
diff --cc net/core/dev.c
index 7647278,449b45b..321d41a
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@@ -6109,9 -6068,13 +6110,9 @@@ static gro_result_t napi_skb_finish(str
  {
  	switch (ret) {
  	case GRO_NORMAL:
- 		gro_normal_one(napi, skb);
+ 		gro_normal_one(napi, skb, 1);
  		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);
@@@ -6193,9 -6156,13 +6194,9 @@@ static gro_result_t napi_frags_finish(s
  		__skb_push(skb, ETH_HLEN);
  		skb->protocol = eth_type_trans(skb, skb->dev);
  		if (ret == GRO_NORMAL)
- 			gro_normal_one(napi, skb);
+ 			gro_normal_one(napi, skb, 1);
  		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);