diff options
| author | Shiji Yang | 2025-05-06 11:30:52 +0000 |
|---|---|---|
| committer | Hauke Mehrtens | 2025-07-20 13:33:03 +0000 |
| commit | 334a4322dd2bb8bc637a1f3968db29f8bbca363e (patch) | |
| tree | 334fa6ae87c92e3f288fe30f26e315eb94e2b896 | |
| parent | cdf2e21e82d012c0a8b01214e6788008a2d4a506 (diff) | |
| download | openwrt-334a4322dd2bb8bc637a1f3968db29f8bbca363e.tar.gz | |
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>
| -rw-r--r-- | target/linux/ipq40xx/patches-6.12/701-net-dsa-add-out-of-band-tagging-protocol.patch | 4 | ||||
| -rw-r--r-- | target/linux/ipq40xx/patches-6.12/702-net-ipqess-Add-out-of-band-DSA-tagging-support.patch | 2 |
2 files changed, 3 insertions, 3 deletions
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 65229c9d0d..79a4f74fcf 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 <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 47bf5e2c16..f6c58c9128 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 <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) |