aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2020-09-12 12:16:41 -0400
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-09-12 23:39:25 +0200
commit17e64b9447959858c5c85f7f6c98264775585711 (patch)
tree6e5aa8c3121347443216647e2c5b26ebde99e63f /target/linux/generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
parent96586ad8cabee6b697a8269b3a9274e138334f9e (diff)
downloadupstream-17e64b9447959858c5c85f7f6c98264775585711.tar.gz
upstream-17e64b9447959858c5c85f7f6c98264775585711.tar.bz2
upstream-17e64b9447959858c5c85f7f6c98264775585711.zip
kernel: bump 5.4 to 5.4.65
All modifications made by update_kernel.sh/no manual intervention needed Build-tested: x86_64 Run-tested: ipq806x (R7800) No dmesg regressions, everything functional Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch')
-rw-r--r--target/linux/generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
index 5ba7f3e693..8ca7b0be35 100644
--- a/target/linux/generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
+++ b/target/linux/generic/pending-5.4/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;
-@@ -7262,6 +7265,48 @@ static void __netdev_adjacent_dev_unlink
+@@ -7263,6 +7266,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,
-@@ -7312,6 +7357,7 @@ static int __netdev_upper_dev_link(struc
+@@ -7313,6 +7358,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);
-@@ -7405,6 +7451,7 @@ void netdev_upper_dev_unlink(struct net_
+@@ -7406,6 +7452,7 @@ void netdev_upper_dev_unlink(struct net_
__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);
-@@ -8135,6 +8182,7 @@ int dev_set_mac_address(struct net_devic
+@@ -8136,6 +8183,7 @@ int dev_set_mac_address(struct net_devic
if (err)
return err;
dev->addr_assign_type = NET_ADDR_SET;