--- a/net/core/dev.c
+++ b/net/core/dev.c
-@@ -7593,6 +7593,48 @@ static void __netdev_adjacent_dev_unlink
+@@ -7597,6 +7597,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,
-@@ -7644,6 +7686,7 @@ static int __netdev_upper_dev_link(struc
+@@ -7648,6 +7690,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);
-@@ -7740,6 +7783,7 @@ static void __netdev_upper_dev_unlink(st
+@@ -7744,6 +7787,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);
-@@ -8792,6 +8836,7 @@ int dev_set_mac_address(struct net_devic
+@@ -8796,6 +8840,7 @@ int dev_set_mac_address(struct net_devic
if (err)
return err;
dev->addr_assign_type = NET_ADDR_SET;