From 6c6a003c7d7835da254ca1640cf82c99092be0c1 Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Fri, 10 Oct 2025 11:49:56 +0200 Subject: [PATCH] realtek: dsa: Fix name of RTL93xx switch_ops The RTL930x and the RTL931x SoC families share the same struct dsa_switch_ops. This should be represented in the name of the object. Suggested-by: Felix Baumann Signed-off-by: Sven Eckelmann Link: https://github.com/openwrt/openwrt/pull/20360 Signed-off-by: Robert Marko --- .../realtek/files-6.12/drivers/net/dsa/rtl83xx/common.c | 6 +++--- .../linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/dsa.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/common.c b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/common.c index a7f7e43d0e..aae66b78cd 100644 --- a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/common.c +++ b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/common.c @@ -24,7 +24,7 @@ extern const struct rtl838x_reg rtl930x_reg; extern const struct rtl838x_reg rtl931x_reg; extern const struct dsa_switch_ops rtl83xx_switch_ops; -extern const struct dsa_switch_ops rtl930x_switch_ops; +extern const struct dsa_switch_ops rtl93xx_switch_ops; extern struct phylink_pcs *rtpcs_create(struct device *dev, struct device_node *np, int port); @@ -1591,7 +1591,7 @@ static int __init rtl83xx_sw_probe(struct platform_device *pdev) priv->n_counters = 1024; break; case RTL9300_FAMILY_ID: - priv->ds->ops = &rtl930x_switch_ops; + priv->ds->ops = &rtl93xx_switch_ops; priv->cpu_port = RTL930X_CPU_PORT; priv->port_mask = 0x1f; priv->port_width = 1; @@ -1611,7 +1611,7 @@ static int __init rtl83xx_sw_probe(struct platform_device *pdev) priv->n_counters = 2048; break; case RTL9310_FAMILY_ID: - priv->ds->ops = &rtl930x_switch_ops; + priv->ds->ops = &rtl93xx_switch_ops; priv->cpu_port = RTL931X_CPU_PORT; priv->port_mask = 0x3f; priv->port_width = 2; diff --git a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/dsa.c b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/dsa.c index bc8f9b6562..217c113876 100644 --- a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/dsa.c +++ b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/dsa.c @@ -2614,7 +2614,7 @@ const struct dsa_switch_ops rtl83xx_switch_ops = { .port_bridge_flags = rtl83xx_port_bridge_flags, }; -const struct dsa_switch_ops rtl930x_switch_ops = { +const struct dsa_switch_ops rtl93xx_switch_ops = { .get_tag_protocol = rtl83xx_get_tag_protocol, .setup = rtl93xx_setup, -- 2.30.2