From: Shiji Yang Date: Tue, 6 May 2025 11:30:52 +0000 (+0800) Subject: ipq40xx: tag_oob/ipqess: update DSA APIs X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=334a4322dd2bb8bc637a1f3968db29f8bbca363e;p=thirdparty%2Fopenwrt.git ipq40xx: tag_oob/ipqess: update DSA APIs In the new 6.12 LTS kernel, master/slave keywords were replaced by conduit/user. Link: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-6.12.y&id=6ca80638b90cec66547011ee1ef79e534589989a Signed-off-by: Shiji Yang Link: https://github.com/openwrt/openwrt/pull/18725 Signed-off-by: Hauke Mehrtens --- diff --git a/target/linux/ipq40xx/patches-6.12/701-net-dsa-add-out-of-band-tagging-protocol.patch b/target/linux/ipq40xx/patches-6.12/701-net-dsa-add-out-of-band-tagging-protocol.patch index 65229c9d0dd..79a4f74fcf2 100644 --- a/target/linux/ipq40xx/patches-6.12/701-net-dsa-add-out-of-band-tagging-protocol.patch +++ b/target/linux/ipq40xx/patches-6.12/701-net-dsa-add-out-of-band-tagging-protocol.patch @@ -193,7 +193,7 @@ Signed-off-by: Maxime Chevallier + struct net_device *dev) +{ + struct dsa_oob_tag_info *tag_info = skb_ext_add(skb, SKB_EXT_DSA_OOB); -+ struct dsa_port *dp = dsa_slave_to_port(dev); ++ struct dsa_port *dp = dsa_user_to_port(dev); + + tag_info->port = dp->index; + @@ -208,7 +208,7 @@ Signed-off-by: Maxime Chevallier + if (!tag_info) + return NULL; + -+ skb->dev = dsa_master_find_slave(dev, 0, tag_info->port); ++ skb->dev = dsa_conduit_find_user(dev, 0, tag_info->port); + if (!skb->dev) + return NULL; + diff --git a/target/linux/ipq40xx/patches-6.12/702-net-ipqess-Add-out-of-band-DSA-tagging-support.patch b/target/linux/ipq40xx/patches-6.12/702-net-ipqess-Add-out-of-band-DSA-tagging-support.patch index 47bf5e2c161..f6c58c91286 100644 --- a/target/linux/ipq40xx/patches-6.12/702-net-ipqess-Add-out-of-band-DSA-tagging-support.patch +++ b/target/linux/ipq40xx/patches-6.12/702-net-ipqess-Add-out-of-band-DSA-tagging-support.patch @@ -126,7 +126,7 @@ Signed-off-by: Matthias Schiffer + case NETDEV_CHANGEUPPER: + info = ptr; + -+ if (!dsa_slave_dev_check(info->upper_dev)) ++ if (!dsa_user_dev_check(info->upper_dev)) + return NOTIFY_DONE; + + if (info->linking)