generic-4.9: fix error patch (coolsnowwolf#3776)

This commit fix  39edfa9.

target/linux/generic/hack-4.9/952-net-conntrack-events-support-multiple-registrant.patch

@@ -268,7 +268,7 @@ Signed-off-by: Zhi Chen <[email protected]>
  				      struct nf_ct_event_notifier *new)
  {
 @@ -292,6 +383,7 @@ void nf_conntrack_unregister_notifier(st
- 	RCU_INIT_POINTER(net->ct.nf_conntrack_event_cb, NULL);
+ 	mutex_unlock(&nf_ct_ecache_mutex);
  	/* synchronize_rcu() is called from ctnetlink_exit. */
  }
 +#endif

target/linux/generic/pending-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch

@@ -22,19 +22,19 @@ Signed-off-by: Felix Fietkau <[email protected]>
  #endif
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
-@@ -757,7 +757,8 @@ struct sk_buff {
+@@ -747,7 +747,8 @@ struct sk_buff {
  #ifdef CONFIG_NET_SWITCHDEV
  	__u8			offload_fwd_mark:1;
  #endif
 -	/* 2, 4 or 5 bit hole */
 +	__u8			gro_skip:1;
 +	/* 1, 3 or 4 bit hole */
 
- #if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
- 	__u8			imq_flags:IMQ_F_BITS;
+ #ifdef CONFIG_NET_SCHED
+ 	__u16			tc_index;	/* traffic control index */
 --- a/net/core/dev.c
 +++ b/net/core/dev.c
-@@ -4582,6 +4582,9 @@ static enum gro_result dev_gro_receive(s
+@@ -4572,6 +4572,9 @@ static enum gro_result dev_gro_receive(s
  	enum gro_result ret;
  	int grow;
 
@@ -44,7 +44,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  	if (!(skb->dev->features & NETIF_F_GRO))
  		goto normal;
 
-@@ -5877,6 +5880,48 @@ static void __netdev_adjacent_dev_unlink
+@@ -5867,6 +5870,48 @@ static void __netdev_adjacent_dev_unlink
  					   &upper_dev->adj_list.lower);
  }
 
@@ -93,23 +93,23 @@ Signed-off-by: Felix Fietkau <[email protected]>
  static int __netdev_upper_dev_link(struct net_device *dev,
  				   struct net_device *upper_dev, bool master,
  				   void *upper_priv, void *upper_info)
-@@ -5877,6 +5880,48 @@ static void __netdev_adjacent_dev_unlink
+@@ -5939,6 +5984,7 @@ static int __netdev_upper_dev_link(struc
  			goto rollback_lower_mesh;
  	}
 
 +	netdev_update_addr_mask(dev);
  	ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev,
  					    &changeupper_info.info);
  	ret = notifier_to_errno(ret);
-@@ -6075,6 +6121,7 @@ void netdev_upper_dev_unlink(struct net_
+@@ -6065,6 +6111,7 @@ void netdev_upper_dev_unlink(struct net_
  	list_for_each_entry(i, &upper_dev->all_adj_list.upper, list)
  		__netdev_adjacent_dev_unlink(dev, i->dev, i->ref_nr);
 
 +	netdev_update_addr_mask(dev);
  	call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev,
  				      &changeupper_info.info);
  }
-@@ -6678,6 +6725,7 @@ int dev_set_mac_address(struct net_devic
+@@ -6668,6 +6715,7 @@ int dev_set_mac_address(struct net_devic
  	if (err)
  		return err;
  	dev->addr_assign_type = NET_ADDR_SET;