|
@@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
|
|
|
|
|
|
--- a/include/linux/netdevice.h
|
|
|
+++ b/include/linux/netdevice.h
|
|
|
-@@ -2068,6 +2068,8 @@ struct net_device {
|
|
|
+@@ -2075,6 +2075,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]>
|
|
|
__u8 inner_protocol_type:1;
|
|
|
--- a/net/core/dev.c
|
|
|
+++ b/net/core/dev.c
|
|
|
-@@ -6051,6 +6051,9 @@ static enum gro_result dev_gro_receive(s
|
|
|
+@@ -6055,6 +6055,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;
|
|
|
|
|
|
-@@ -8065,6 +8068,48 @@ static void __netdev_adjacent_dev_unlink
|
|
|
+@@ -8069,6 +8072,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,
|
|
|
-@@ -8116,6 +8161,7 @@ static int __netdev_upper_dev_link(struc
|
|
|
+@@ -8120,6 +8165,7 @@ static int __netdev_upper_dev_link(struc
|
|
|
if (ret)
|
|
|
return ret;
|
|
|
|
|
@@ -99,7 +99,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
|
|
|
ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER,
|
|
|
&changeupper_info.info);
|
|
|
ret = notifier_to_errno(ret);
|
|
|
-@@ -8212,6 +8258,7 @@ static void __netdev_upper_dev_unlink(st
|
|
|
+@@ -8216,6 +8262,7 @@ static void __netdev_upper_dev_unlink(st
|
|
|
|
|
|
__netdev_adjacent_dev_unlink_neighbour(dev, upper_dev);
|
|
|
|
|
@@ -107,7 +107,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
|
|
|
call_netdevice_notifiers_info(NETDEV_CHANGEUPPER,
|
|
|
&changeupper_info.info);
|
|
|
|
|
|
-@@ -9031,6 +9078,7 @@ int dev_set_mac_address(struct net_devic
|
|
|
+@@ -9035,6 +9082,7 @@ int dev_set_mac_address(struct net_devic
|
|
|
if (err)
|
|
|
return err;
|
|
|
dev->addr_assign_type = NET_ADDR_SET;
|