aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-5.10/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
diff options
context:
space:
mode:
authorRui Salvaterra <rsalvaterra@gmail.com>2021-07-19 09:59:05 +0100
committerDaniel Golle <daniel@makrotopia.org>2021-07-20 04:11:05 +0100
commita395cd00d23602bfa9c568593e7b9a8f5b258ab1 (patch)
tree2471cd3449250e6ddcde1fb7cb61553e7d48f68a /target/linux/generic/pending-5.10/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
parentaaf1028296f45120f8e95491d1c8094bc8e8b693 (diff)
downloadupstream-a395cd00d23602bfa9c568593e7b9a8f5b258ab1.tar.gz
upstream-a395cd00d23602bfa9c568593e7b9a8f5b258ab1.tar.bz2
upstream-a395cd00d23602bfa9c568593e7b9a8f5b258ab1.zip
kernel: bump 5.10 to 5.10.51
No deleted or manually refreshed patches. Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
Diffstat (limited to 'target/linux/generic/pending-5.10/680-NET-skip-GRO-for-foreign-MAC-addresses.patch')
-rw-r--r--target/linux/generic/pending-5.10/680-NET-skip-GRO-for-foreign-MAC-addresses.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/pending-5.10/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/pending-5.10/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
index 33d64ab3da..8a47b3ab21 100644
--- a/target/linux/generic/pending-5.10/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
+++ b/target/linux/generic/pending-5.10/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
@@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (netif_elide_gro(skb->dev))
goto normal;
-@@ -8006,6 +8009,48 @@ static void __netdev_adjacent_dev_unlink
+@@ -8013,6 +8016,48 @@ static void __netdev_adjacent_dev_unlink
&upper_dev->adj_list.lower);
}
@@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
static int __netdev_upper_dev_link(struct net_device *dev,
struct net_device *upper_dev, bool master,
void *upper_priv, void *upper_info,
-@@ -8057,6 +8102,7 @@ static int __netdev_upper_dev_link(struc
+@@ -8064,6 +8109,7 @@ static int __netdev_upper_dev_link(struc
if (ret)
return ret;
@@ -99,7 +99,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER,
&changeupper_info.info);
ret = notifier_to_errno(ret);
-@@ -8153,6 +8199,7 @@ static void __netdev_upper_dev_unlink(st
+@@ -8160,6 +8206,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 <nbd@nbd.name>
call_netdevice_notifiers_info(NETDEV_CHANGEUPPER,
&changeupper_info.info);
-@@ -8939,6 +8986,7 @@ int dev_set_mac_address(struct net_devic
+@@ -8946,6 +8993,7 @@ int dev_set_mac_address(struct net_devic
if (err)
return err;
dev->addr_assign_type = NET_ADDR_SET;