From: Sven Eckelmann Date: Wed, 29 Jan 2025 18:23:33 +0000 (+0100) Subject: realtek: rtl931x: Fix size of TRK_MBR_CTRL group block X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92489f50c766c7c532b7a0230fd6181c840f7310;p=thirdparty%2Fopenwrt.git realtek: rtl931x: Fix size of TRK_MBR_CTRL group block Each MBR ctrl block has 64 bits to store the 56 possible ports. The offsets between the groups is therefore also 64 bit. Signed-off-by: Sven Eckelmann Signed-off-by: Sharadanand Karanjkar Link: https://github.com/openwrt/openwrt/pull/19574 Signed-off-by: Hauke Mehrtens --- diff --git a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl931x.c b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl931x.c index 05bf68a7447..f6a098c701f 100644 --- a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl931x.c +++ b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl931x.c @@ -179,9 +179,9 @@ static void rtl931x_stp_set(struct rtl838x_switch_priv *priv, u16 msti, u32 port priv->r->exec_tbl0_cmd(cmd); } -inline static int rtl931x_trk_mbr_ctr(int group) +inline static int rtldsa_931x_trk_mbr_ctr(int group) { - return RTL931X_TRK_MBR_CTRL + (group << 2); + return RTL931X_TRK_MBR_CTRL + (group << 3); } static void rtl931x_vlan_tables_read(u32 vlan, struct rtl838x_vlan_info *info) @@ -1675,7 +1675,7 @@ const struct rtl838x_reg rtl931x_reg = { .vlan_port_keep_tag_set = rtl931x_vlan_port_keep_tag_set, .vlan_port_pvidmode_set = rtl931x_vlan_port_pvidmode_set, .vlan_port_pvid_set = rtl931x_vlan_port_pvid_set, - .trk_mbr_ctr = rtl931x_trk_mbr_ctr, + .trk_mbr_ctr = rtldsa_931x_trk_mbr_ctr, .set_vlan_igr_filter = rtl931x_set_igr_filter, .set_vlan_egr_filter = rtl931x_set_egr_filter, .set_distribution_algorithm = rtl931x_set_distribution_algorithm,