kernel: bump 5.4 to 5.4.150

[openwrt/staging/wigyori.git] / target / linux / generic / backport-5.4 / 773-v5.12-net-dsa-move-switchdev-event-implementation-under-th.patch

diff --git a/target/linux/generic/backport-5.4/773-v5.12-net-dsa-move-switchdev-event-implementation-under-th.patch b/target/linux/generic/backport-5.4/773-v5.12-net-dsa-move-switchdev-event-implementation-under-th.patch
index 50c7a0859066ffee8700aa1988cc5efd036e2315..b70986fcc1c9335ee3271f0b88dd6bf0b8314e4f 100644 (file)
--- a/target/linux/generic/backport-5.4/773-v5.12-net-dsa-move-switchdev-event-implementation-under-th.patch
+++ b/target/linux/generic/backport-5.4/773-v5.12-net-dsa-move-switchdev-event-implementation-under-th.patch
@@ -20,7 +20,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 
 --- a/net/dsa/slave.c
 +++ b/net/dsa/slave.c
-@@ -1642,31 +1642,29 @@ static int dsa_slave_switchdev_event(str
+@@ -1640,31 +1640,29 @@ static int dsa_slave_switchdev_event(str
        struct dsa_port *dp;
        int err;
  
@@ -68,7 +68,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                fdb_info = ptr;
  
                if (!fdb_info->added_by_user) {
-@@ -1679,13 +1677,12 @@ static int dsa_slave_switchdev_event(str
+@@ -1677,13 +1675,12 @@ static int dsa_slave_switchdev_event(str
                switchdev_work->vid = fdb_info->vid;
  
                dev_hold(dev);