Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ipq40xx: tag_oob/ipqess: update DSA APIs

Browse source 
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>
This commit is contained in:
Shiji Yang 2025-05-06 19:30:52 +08:00 committed by Hauke Mehrtens
parent cdf2e21e82
commit 334a4322dd
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
target/linux/ipq40xx/patches-6.12/701-net-dsa-add-out-of-band-tagging-protocol.patch
View file

@ -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;
+

2
target/linux/ipq40xx/patches-6.12/702-net-ipqess-Add-out-of-band-DSA-tagging-support.patch
View file

@ -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)