diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2021-06-22 00:45:18 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-06-22 23:52:09 +0200 |
commit | 98b1a6435fdf076f0dbd7cfac31ba73795cc6b23 (patch) | |
tree | 1e7163ab14344d89b605c34e470f7c9c931f1b50 /target/linux/generic/backport-5.4/772-v5.12-net-dsa-don-t-use-switchdev_notifier_fdb_info-in-dsa.patch | |
parent | ec780bdb9201182423688e38abd1f1959d32ae47 (diff) | |
download | upstream-98b1a6435fdf076f0dbd7cfac31ba73795cc6b23.tar.gz upstream-98b1a6435fdf076f0dbd7cfac31ba73795cc6b23.tar.bz2 upstream-98b1a6435fdf076f0dbd7cfac31ba73795cc6b23.zip |
kernel: Backport patch to automatically bring up DSA master when opening user port
Without this patch we have to manually bring up the CPU interface in
failsafe mode.
This was backported from kernel 5.12.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Tested-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit 2e17c710954bd3506467d700dee23757b138fedd)
Diffstat (limited to 'target/linux/generic/backport-5.4/772-v5.12-net-dsa-don-t-use-switchdev_notifier_fdb_info-in-dsa.patch')
-rw-r--r-- | target/linux/generic/backport-5.4/772-v5.12-net-dsa-don-t-use-switchdev_notifier_fdb_info-in-dsa.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/backport-5.4/772-v5.12-net-dsa-don-t-use-switchdev_notifier_fdb_info-in-dsa.patch b/target/linux/generic/backport-5.4/772-v5.12-net-dsa-don-t-use-switchdev_notifier_fdb_info-in-dsa.patch index e9b74053e0..bc29fbecc4 100644 --- a/target/linux/generic/backport-5.4/772-v5.12-net-dsa-don-t-use-switchdev_notifier_fdb_info-in-dsa.patch +++ b/target/linux/generic/backport-5.4/772-v5.12-net-dsa-don-t-use-switchdev_notifier_fdb_info-in-dsa.patch @@ -54,7 +54,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> struct sk_buff * (*xmit)(struct sk_buff *skb, --- a/net/dsa/slave.c +++ b/net/dsa/slave.c -@@ -1567,76 +1567,66 @@ static int dsa_slave_netdevice_event(str +@@ -1570,76 +1570,66 @@ static int dsa_slave_netdevice_event(str return NOTIFY_DONE; } @@ -167,7 +167,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> } /* Called under rcu_read_lock() */ -@@ -1644,7 +1634,9 @@ static int dsa_slave_switchdev_event(str +@@ -1647,7 +1637,9 @@ static int dsa_slave_switchdev_event(str unsigned long event, void *ptr) { struct net_device *dev = switchdev_notifier_info_to_dev(ptr); @@ -177,7 +177,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> int err; if (event == SWITCHDEV_PORT_ATTR_SET) { -@@ -1657,20 +1649,32 @@ static int dsa_slave_switchdev_event(str +@@ -1660,20 +1652,32 @@ static int dsa_slave_switchdev_event(str if (!dsa_slave_dev_check(dev)) return NOTIFY_DONE; @@ -213,7 +213,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> dev_hold(dev); break; default: -@@ -1680,10 +1684,6 @@ static int dsa_slave_switchdev_event(str +@@ -1683,10 +1687,6 @@ static int dsa_slave_switchdev_event(str dsa_schedule_work(&switchdev_work->work); return NOTIFY_OK; |