kernel: 5.10: backport QCA83x PHY resume fix, DAC amplitude preferred master, debug...

[openwrt/openwrt.git] / target / linux / generic / backport-5.10 / 775-v5.12-net-dsa-listen-for-SWITCHDEV_-FDB-DEL-_ADD_TO_DEVICE.patch

diff --git a/target/linux/generic/backport-5.10/775-v5.12-net-dsa-listen-for-SWITCHDEV_-FDB-DEL-_ADD_TO_DEVICE.patch b/target/linux/generic/backport-5.10/775-v5.12-net-dsa-listen-for-SWITCHDEV_-FDB-DEL-_ADD_TO_DEVICE.patch
index 70d6629ee7112f2c49812aeea32d87c9ded0f87e..e7b9af19515cd8c978c4ceef3485458de1e5fc7f 100644 (file)
--- a/target/linux/generic/backport-5.10/775-v5.12-net-dsa-listen-for-SWITCHDEV_-FDB-DEL-_ADD_TO_DEVICE.patch
+++ b/target/linux/generic/backport-5.10/775-v5.12-net-dsa-listen-for-SWITCHDEV_-FDB-DEL-_ADD_TO_DEVICE.patch
@@ -170,7 +170,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
         */
 --- a/net/dsa/slave.c
 +++ b/net/dsa/slave.c
-@@ -2151,6 +2151,28 @@ static void dsa_slave_switchdev_event_wo
+@@ -2149,6 +2149,28 @@ static void dsa_slave_switchdev_event_wo
                dev_put(dp->slave);
  }
  
@@ -199,7 +199,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  /* Called under rcu_read_lock() */
  static int dsa_slave_switchdev_event(struct notifier_block *unused,
                                     unsigned long event, void *ptr)
-@@ -2169,10 +2191,37 @@ static int dsa_slave_switchdev_event(str
+@@ -2167,10 +2189,37 @@ static int dsa_slave_switchdev_event(str
                return notifier_from_errno(err);
        case SWITCHDEV_FDB_ADD_TO_DEVICE:
        case SWITCHDEV_FDB_DEL_TO_DEVICE:
@@ -240,7 +240,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  
                if (!dp->ds->ops->port_fdb_add || !dp->ds->ops->port_fdb_del)
                        return NOTIFY_DONE;
-@@ -2187,18 +2236,13 @@ static int dsa_slave_switchdev_event(str
+@@ -2185,18 +2234,13 @@ static int dsa_slave_switchdev_event(str
                switchdev_work->port = dp->index;
                switchdev_work->event = event;