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 <yangshiji66@outlook.com>
Link: https://github.com/openwrt/openwrt/pull/18725
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

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 65229c9d0ddaa3b7e70812e8066cdd68e879b075..79a4f74fcf2e663880e7363c00fb7d4b59f4da55 100644 (file)
--- 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 <maxime.chevallier@bootlin.com>
 +                                  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 <maxime.chevallier@bootlin.com>
 +      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 47bf5e2c1613f370a27faadfd4670ebd10053aa1..f6c58c912860358e3dca384cfc66b8e240878bc3 100644 (file)
--- 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 <mschiffer@universe-factory.net>
 +      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)