From: Linus Walleij <linusw@kernel.org>
To: Andrew Lunn <andrew@lunn.ch>, 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>,
Woojung Huh <woojung.huh@microchip.com>
Cc: UNGLinuxDriver@microchip.com, netdev@vger.kernel.org,
Linus Walleij <linusw@kernel.org>
Subject: [PATCH net v4 4/4] net: dsa: ks8995: Add stub bridge join/leave
Date: Thu, 26 Mar 2026 10:57:35 +0100 [thread overview]
Message-ID: <20260326-ks8995-fixups-v4-4-989abba8f077@kernel.org> (raw)
In-Reply-To: <20260326-ks8995-fixups-v4-0-989abba8f077@kernel.org>
Implementing ks8995_port_pre_bridge_flags() and
ks8995_port_bridge_flags() without port_bridge_join()
is a no-op.
This adds stubs for bridge join/leave callbacks following
the pattern of drivers/net/dsa/microchip/ksz_common.c:
as we have STP callbacks and these will be called right
after bridge join/leave these will take care of the
job of setting up the learning which is all we support.
Fixes: a7fe8b266f65 ("net: dsa: ks8995: Add basic switch set-up")
Reported-by: Vladimir Oltean <olteanv@gmail.com>
Signed-off-by: Linus Walleij <linusw@kernel.org>
---
drivers/net/dsa/ks8995.c | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/drivers/net/dsa/ks8995.c b/drivers/net/dsa/ks8995.c
index b7c9de39f68e..1ed81a8f7d21 100644
--- a/drivers/net/dsa/ks8995.c
+++ b/drivers/net/dsa/ks8995.c
@@ -461,6 +461,26 @@ static void ks8995_port_disable(struct dsa_switch *ds, int port)
dev_dbg(ks->dev, "disable port %d\n", port);
}
+static int ks8995_port_bridge_join(struct dsa_switch *ds, int port,
+ struct dsa_bridge bridge,
+ bool *tx_fwd_offload,
+ struct netlink_ext_ack *extack)
+{
+ /* port_stp_state_set() will be called after to put the port in
+ * appropriate state so there is no need to do anything.
+ */
+
+ return 0;
+}
+
+static void ks8995_port_bridge_leave(struct dsa_switch *ds, int port,
+ struct dsa_bridge bridge)
+{
+ /* port_stp_state_set() will be called after to put the port in
+ * forwarding state so there is no need to do anything.
+ */
+}
+
static int ks8995_port_pre_bridge_flags(struct dsa_switch *ds, int port,
struct switchdev_brport_flags flags,
struct netlink_ext_ack *extack)
@@ -635,6 +655,8 @@ static int ks8995_get_max_mtu(struct dsa_switch *ds, int port)
static const struct dsa_switch_ops ks8995_ds_ops = {
.get_tag_protocol = ks8995_get_tag_protocol,
.setup = ks8995_setup,
+ .port_bridge_join = ks8995_port_bridge_join,
+ .port_bridge_leave = ks8995_port_bridge_leave,
.port_pre_bridge_flags = ks8995_port_pre_bridge_flags,
.port_bridge_flags = ks8995_port_bridge_flags,
.port_enable = ks8995_port_enable,
--
2.53.0
next prev parent reply other threads:[~2026-03-26 9:57 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-26 9:57 [PATCH net v4 0/4] net: dsa: ks8995: Post-move fixes Linus Walleij
2026-03-26 9:57 ` [PATCH net v4 1/4] net: dsa: ks8995: Add shutdown callback Linus Walleij
2026-03-26 10:03 ` Vladimir Oltean
2026-03-26 9:57 ` [PATCH net v4 2/4] net: dsa: microchip: Add fallback Micrel compatibles Linus Walleij
2026-03-26 10:11 ` Vladimir Oltean
2026-03-26 9:57 ` [PATCH net v4 3/4] net: dsa: ks8955: Delete KSZ8864 and KSZ8795 support Linus Walleij
2026-03-26 10:21 ` Vladimir Oltean
2026-03-26 9:57 ` Linus Walleij [this message]
2026-03-26 10:26 ` [PATCH net v4 4/4] net: dsa: ks8995: Add stub bridge join/leave Vladimir Oltean
2026-03-26 10:02 ` [PATCH net v4 0/4] net: dsa: ks8995: Post-move fixes Vladimir Oltean
2026-03-26 10:06 ` Vladimir Oltean
2026-03-26 10:33 ` Vladimir Oltean
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=20260326-ks8995-fixups-v4-4-989abba8f077@kernel.org \
--to=linusw@kernel.org \
--cc=UNGLinuxDriver@microchip.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=olteanv@gmail.com \
--cc=pabeni@redhat.com \
--cc=woojung.huh@microchip.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