|
|
@@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
|
|
|
|
|
|
--- a/include/linux/netdevice.h
|
|
|
+++ b/include/linux/netdevice.h
|
|
|
-@@ -1887,6 +1887,8 @@ struct net_device {
|
|
|
+@@ -1891,6 +1891,8 @@ struct net_device {
|
|
|
struct netdev_hw_addr_list mc;
|
|
|
struct netdev_hw_addr_list dev_addrs;
|
|
|
|
|
|
@@ -32,7 +32,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
|
|
|
__u16 tc_index; /* traffic control index */
|
|
|
--- a/net/core/dev.c
|
|
|
+++ b/net/core/dev.c
|
|
|
-@@ -5482,6 +5482,9 @@ static enum gro_result dev_gro_receive(s
|
|
|
+@@ -5483,6 +5483,9 @@ static enum gro_result dev_gro_receive(s
|
|
|
int same_flow;
|
|
|
int grow;
|
|
|
|
|
|
@@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
|
|
|
if (netif_elide_gro(skb->dev))
|
|
|
goto normal;
|
|
|
|
|
|
-@@ -6976,6 +6979,48 @@ static void __netdev_adjacent_dev_unlink
|
|
|
+@@ -7141,6 +7144,48 @@ static void __netdev_adjacent_dev_unlink
|
|
|
&upper_dev->adj_list.lower);
|
|
|
}
|
|
|
|
|
|
@@ -91,7 +91,7 @@ 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,
|
|
|
-@@ -7023,6 +7068,7 @@ static int __netdev_upper_dev_link(struc
|
|
|
+@@ -7191,6 +7236,7 @@ static int __netdev_upper_dev_link(struc
|
|
|
if (ret)
|
|
|
return ret;
|
|
|
|
|
|
@@ -99,15 +99,15 @@ Signed-off-by: Felix Fietkau <[email protected]>
|
|
|
ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER,
|
|
|
&changeupper_info.info);
|
|
|
ret = notifier_to_errno(ret);
|
|
|
-@@ -7109,6 +7155,7 @@ void netdev_upper_dev_unlink(struct net_
|
|
|
+@@ -7283,6 +7329,7 @@ void netdev_upper_dev_unlink(struct net_
|
|
|
|
|
|
__netdev_adjacent_dev_unlink_neighbour(dev, upper_dev);
|
|
|
|
|
|
+ netdev_update_addr_mask(dev);
|
|
|
call_netdevice_notifiers_info(NETDEV_CHANGEUPPER,
|
|
|
&changeupper_info.info);
|
|
|
- }
|
|
|
-@@ -7733,6 +7780,7 @@ int dev_set_mac_address(struct net_devic
|
|
|
+
|
|
|
+@@ -7913,6 +7960,7 @@ int dev_set_mac_address(struct net_devic
|
|
|
if (err)
|
|
|
return err;
|
|
|
dev->addr_assign_type = NET_ADDR_SET;
|