if (netif_elide_gro(skb->dev))
goto normal;
-@@ -8091,6 +8094,48 @@ static void __netdev_adjacent_dev_unlink
+@@ -8094,6 +8097,48 @@ static void __netdev_adjacent_dev_unlink
&upper_dev->adj_list.lower);
}
static int __netdev_upper_dev_link(struct net_device *dev,
struct net_device *upper_dev, bool master,
void *upper_priv, void *upper_info,
-@@ -8142,6 +8187,7 @@ static int __netdev_upper_dev_link(struc
+@@ -8145,6 +8190,7 @@ static int __netdev_upper_dev_link(struc
if (ret)
return ret;
ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER,
&changeupper_info.info);
ret = notifier_to_errno(ret);
-@@ -8238,6 +8284,7 @@ static void __netdev_upper_dev_unlink(st
+@@ -8241,6 +8287,7 @@ static void __netdev_upper_dev_unlink(st
__netdev_adjacent_dev_unlink_neighbour(dev, upper_dev);
call_netdevice_notifiers_info(NETDEV_CHANGEUPPER,
&changeupper_info.info);
-@@ -9057,6 +9104,7 @@ int dev_set_mac_address(struct net_devic
+@@ -9060,6 +9107,7 @@ int dev_set_mac_address(struct net_devic
if (err)
return err;
dev->addr_assign_type = NET_ADDR_SET;