aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-4.14
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2018-02-24 12:47:59 +0100
committerFelix Fietkau <nbd@nbd.name>2018-02-24 16:05:28 +0100
commitae27cbf98b151b815414eaa6dca7dcf6343b6ac2 (patch)
tree29ebc720d3b4883974a53f7429a3be80c62a1ad1 /target/linux/generic/pending-4.14
parent9a0cc49089e38896391a1003892aba3aa684f868 (diff)
downloadupstream-ae27cbf98b151b815414eaa6dca7dcf6343b6ac2.tar.gz
upstream-ae27cbf98b151b815414eaa6dca7dcf6343b6ac2.tar.bz2
upstream-ae27cbf98b151b815414eaa6dca7dcf6343b6ac2.zip
kernel: generic: Fix skip GRO for foreign MAC address patches
Somewhere in the kernel 4.9 migration process it looks like this patch was broken. The update should be done when a device is added to the bridge and when it gets removed, currently it is only done on the remove path twice which does not make any sense. I do not have a setup to test this now so this is only compile tested. Fixes: f791fb4af450 ("kernel: add linux 4.9 support") Fixes: b3f95490b9be ("kernel: generic: Add kernel 4.14 support") Reported-by: Andrey Jr. Melnikov <temnota.am@gmail.com> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/pending-4.14')
-rw-r--r--target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch11
1 files changed, 9 insertions, 2 deletions
diff --git a/target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
index 5bcf99a648..d565a1b8bd 100644
--- a/target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
+++ b/target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
@@ -91,12 +91,19 @@ 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)
-@@ -6353,6 +6398,8 @@ void netdev_upper_dev_unlink(struct net_
+@@ -6276,6 +6321,7 @@ static int __netdev_upper_dev_link(struc
+ if (ret)
+ return ret;
+
++ netdev_update_addr_mask(dev);
+ ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev,
+ &changeupper_info.info);
+ ret = notifier_to_errno(ret);
+@@ -6353,6 +6399,7 @@ void netdev_upper_dev_unlink(struct net_
__netdev_adjacent_dev_unlink_neighbour(dev, upper_dev);
+ netdev_update_addr_mask(dev);
-+ netdev_update_addr_mask(dev);
call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev,
&changeupper_info.info);
}