From: Pawel Dembicki <paweldembicki@gmail.com>
To: netdev@vger.kernel.org
Cc: Linus Walleij <linus.walleij@linaro.org>,
Simon Horman <horms@kernel.org>,
Vladimir Oltean <vladimir.oltean@nxp.com>,
Pawel Dembicki <paweldembicki@gmail.com>,
Andrew Lunn <andrew@lunn.ch>,
Florian Fainelli <f.fainelli@gmail.com>,
Vladimir Oltean <olteanv@gmail.com>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Claudiu Manoil <claudiu.manoil@nxp.com>,
Alexandre Belloni <alexandre.belloni@bootlin.com>,
UNGLinuxDriver@microchip.com,
Russell King <linux@armlinux.org.uk>,
linux-kernel@vger.kernel.org
Subject: [PATCH net-next v6 10/16] net: dsa: tag_sja1105: prefer precise source port info on SJA1110 too
Date: Fri, 1 Mar 2024 23:16:32 +0100 [thread overview]
Message-ID: <20240301221641.159542-11-paweldembicki@gmail.com> (raw)
In-Reply-To: <20240301221641.159542-1-paweldembicki@gmail.com>
From: Vladimir Oltean <vladimir.oltean@nxp.com>
Now that dsa_8021q_rcv() handles better the case where we don't
overwrite the precise source information if it comes from an external
(non-tag_8021q) source, we can now unify the call sequence between
sja1105_rcv() and sja1110_rcv().
This is a preparatory change for creating a higher-level wrapper for the
entire sequence which will live in tag_8021q.
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
---
v6,v5:
- resend only
v4:
- introduce patch and replace 'slave' with 'conduit' after rebase
net/dsa/tag_sja1105.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/net/dsa/tag_sja1105.c b/net/dsa/tag_sja1105.c
index 7639ccb94d35..35a6346549f2 100644
--- a/net/dsa/tag_sja1105.c
+++ b/net/dsa/tag_sja1105.c
@@ -652,12 +652,12 @@ static struct sk_buff *sja1110_rcv(struct sk_buff *skb,
if (likely(sja1105_skb_has_tag_8021q(skb)))
dsa_8021q_rcv(skb, &source_port, &switch_id, &vbid, &vid);
- if (vbid >= 1)
+ if (source_port != -1 && switch_id != -1)
+ skb->dev = dsa_conduit_find_user(netdev, switch_id, source_port);
+ else if (vbid >= 1)
skb->dev = dsa_tag_8021q_find_port_by_vbid(netdev, vbid);
- else if (source_port == -1 || switch_id == -1)
- skb->dev = dsa_find_designated_bridge_port_by_vid(netdev, vid);
else
- skb->dev = dsa_conduit_find_user(netdev, switch_id, source_port);
+ skb->dev = dsa_find_designated_bridge_port_by_vid(netdev, vid);
if (!skb->dev) {
netdev_warn(netdev, "Couldn't decode source port\n");
return NULL;
--
2.34.1
next prev parent reply other threads:[~2024-03-01 22:18 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-01 22:16 [PATCH net-next v6 00/16] net: dsa: vsc73xx: Make vsc73xx usable Pawel Dembicki
2024-03-01 22:16 ` [PATCH net-next v6 01/16] net: dsa: vsc73xx: use read_poll_timeout instead delay loop Pawel Dembicki
2024-03-01 22:16 ` [PATCH net-next v6 02/16] net: dsa: vsc73xx: convert to PHYLINK Pawel Dembicki
2024-03-05 23:15 ` Florian Fainelli
2024-03-06 8:40 ` Linus Walleij
2024-03-06 8:46 ` Russell King (Oracle)
2024-03-01 22:16 ` [PATCH net-next v6 03/16] net: dsa: vsc73xx: use macros for rgmii recognition Pawel Dembicki
2024-03-06 8:47 ` Russell King (Oracle)
2024-03-01 22:16 ` [PATCH net-next v6 04/16] net: dsa: vsc73xx: Add define for max num of ports Pawel Dembicki
2024-03-01 23:39 ` Linus Walleij
2024-03-05 23:16 ` Florian Fainelli
2024-03-01 22:16 ` [PATCH net-next v6 05/16] net: dsa: vsc73xx: add structure descriptions Pawel Dembicki
2024-03-01 22:16 ` [PATCH net-next v6 06/16] net: dsa: vsc73xx: add port_stp_state_set function Pawel Dembicki
2024-03-05 22:42 ` Linus Walleij
2024-03-05 23:18 ` Florian Fainelli
2024-03-08 9:54 ` Vladimir Oltean
2024-03-01 22:16 ` [PATCH net-next v6 07/16] net: dsa: vsc73xx: Add vlan filtering Pawel Dembicki
2024-03-05 23:51 ` Florian Fainelli
2024-03-08 13:09 ` Vladimir Oltean
2024-03-25 20:42 ` Paweł Dembicki
2024-03-08 12:38 ` Vladimir Oltean
2024-03-01 22:16 ` [PATCH net-next v6 08/16] net: dsa: tag_sja1105: absorb logic for not overwriting precise info into dsa_8021q_rcv() Pawel Dembicki
2024-03-01 22:16 ` [PATCH net-next v6 09/16] net: dsa: tag_sja1105: absorb entire sja1105_vlan_rcv() " Pawel Dembicki
2024-03-01 22:16 ` Pawel Dembicki [this message]
2024-03-01 22:16 ` [PATCH net-next v6 11/16] net: dsa: tag_sja1105: refactor skb->dev assignment to dsa_tag_8021q_find_user() Pawel Dembicki
2024-03-06 23:12 ` Florian Fainelli
2024-03-01 22:16 ` [PATCH net-next v6 12/16] net: dsa: vsc73xx: introduce tag 8021q for vsc73xx Pawel Dembicki
2024-03-06 23:14 ` Florian Fainelli
2024-03-08 9:45 ` Vladimir Oltean
2024-03-01 22:16 ` [PATCH net-next v6 13/16] net: dsa: vsc73xx: Implement the tag_8021q VLAN operations Pawel Dembicki
2024-03-01 22:16 ` [PATCH net-next v6 14/16] net: dsa: Define max num of bridges in tag8021q implementation Pawel Dembicki
2024-03-06 8:31 ` Linus Walleij
2024-03-01 22:16 ` [PATCH net-next v6 15/16] net: dsa: vsc73xx: Add bridge support Pawel Dembicki
2024-03-06 23:16 ` Florian Fainelli
2024-03-01 22:16 ` [PATCH net-next v6 16/16] net: dsa: vsc73xx: start treating the BR_LEARNING flag Pawel Dembicki
2024-03-06 8:36 ` Linus Walleij
2024-03-06 23:19 ` Florian Fainelli
2024-03-08 9:42 ` Vladimir Oltean
2024-03-05 22:45 ` [PATCH net-next v6 00/16] net: dsa: vsc73xx: Make vsc73xx usable Linus Walleij
2024-03-05 23:27 ` Florian Fainelli
2024-03-06 9:03 ` Linus Walleij
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240301221641.159542-11-paweldembicki@gmail.com \
--to=paweldembicki@gmail.com \
--cc=UNGLinuxDriver@microchip.com \
--cc=alexandre.belloni@bootlin.com \
--cc=andrew@lunn.ch \
--cc=claudiu.manoil@nxp.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=f.fainelli@gmail.com \
--cc=horms@kernel.org \
--cc=kuba@kernel.org \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=netdev@vger.kernel.org \
--cc=olteanv@gmail.com \
--cc=pabeni@redhat.com \
--cc=vladimir.oltean@nxp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).