From 301da03da578145cb48aaa1b0a8ea4ef286994e5 Mon Sep 17 00:00:00 2001 From: Mantas Pucka Date: Fri, 22 Nov 2024 10:07:06 +0200 Subject: [PATCH] generic: 6.12: fix dsa/qca8k build Fix dsa/qca8k build on kernel 6.12. Signed-off-by: Mantas Pucka --- ...-03-net-dsa-qca8k-add-support-for-port_change_master.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/linux/generic/pending-6.12/711-03-net-dsa-qca8k-add-support-for-port_change_master.patch b/target/linux/generic/pending-6.12/711-03-net-dsa-qca8k-add-support-for-port_change_master.patch index 5bdb4a9da4..25c6ae3f78 100644 --- a/target/linux/generic/pending-6.12/711-03-net-dsa-qca8k-add-support-for-port_change_master.patch +++ b/target/linux/generic/pending-6.12/711-03-net-dsa-qca8k-add-support-for-port_change_master.patch @@ -103,7 +103,7 @@ Signed-off-by: Christian Marangi + + dsa_switch_for_each_user_port(dp, ds) { + /* Skip if assigned master is not the LAG */ -+ if (dsa_port_to_master(dp) != lag_dev) ++ if (dsa_port_to_conduit(dp) != lag_dev) + continue; + + ret = qca8k_port_change_master(ds, dp->index, @@ -152,7 +152,7 @@ Signed-off-by: Christian Marangi - .port_lag_leave = qca8k_port_lag_leave, + .port_lag_join = qca8xxx_port_lag_join, + .port_lag_leave = qca8xxx_port_lag_leave, -+ .port_change_master = qca8xxx_port_change_master, ++ .port_change_conduit = qca8k_port_change_master, .conduit_state_change = qca8k_conduit_change, .connect_tag_protocol = qca8k_connect_tag_protocol, }; -- 2.30.2