|
|
@@ -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
|
|
|
-@@ -6037,6 +6037,9 @@ static enum gro_result dev_gro_receive(s
|
|
|
+@@ -6050,6 +6050,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;
|
|
|
|
|
|
-@@ -8013,6 +8016,48 @@ static void __netdev_adjacent_dev_unlink
|
|
|
+@@ -8027,6 +8030,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,
|
|
|
-@@ -8064,6 +8109,7 @@ static int __netdev_upper_dev_link(struc
|
|
|
+@@ -8078,6 +8123,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);
|
|
|
-@@ -8160,6 +8206,7 @@ static void __netdev_upper_dev_unlink(st
|
|
|
+@@ -8174,6 +8220,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);
|
|
|
|
|
|
-@@ -8946,6 +8993,7 @@ int dev_set_mac_address(struct net_devic
|
|
|
+@@ -8960,6 +9007,7 @@ int dev_set_mac_address(struct net_devic
|
|
|
if (err)
|
|
|
return err;
|
|
|
dev->addr_assign_type = NET_ADDR_SET;
|