Nanako/openwrt
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

realtek: actually remove port from multicast portmask

Browse Source 
Fixes: 724e4af530cd ("realtek: Store and Restore MC memberships for port enable/disable")
Signed-off-by: Jan Hoffmann <jan@3e8.eu>
This commit is contained in:
Jan Hoffmann 2023-05-07 01:05:32 +02:00 committed by Sander Vanheule
parent 57df840670
commit 3356126b82
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
target/linux/realtek/files-5.10/drivers/net/dsa/rtl83xx/dsa.c
View File

@ -1024,6 +1024,7 @@ static u64 rtl83xx_mc_group_del_port(struct rtl838x_switch_priv *priv, int mc_gr
pr_info("%s: %d is lag slave. ignore\n", __func__, port); pr_info("%s: %d is lag slave. ignore\n", __func__, port);
return portmask; return portmask;
} }
portmask &= ~BIT_ULL(port);
priv->r->write_mcast_pmask(mc_group, portmask); priv->r->write_mcast_pmask(mc_group, portmask);
if (portmask == BIT_ULL(priv->cpu_port)) { if (portmask == BIT_ULL(priv->cpu_port)) {
portmask &= ~BIT_ULL(priv->cpu_port); portmask &= ~BIT_ULL(priv->cpu_port);

1
target/linux/realtek/files-5.15/drivers/net/dsa/rtl83xx/dsa.c
View File

@ -1011,6 +1011,7 @@ static u64 rtl83xx_mc_group_del_port(struct rtl838x_switch_priv *priv, int mc_gr
pr_info("%s: %d is lag slave. ignore\n", __func__, port); pr_info("%s: %d is lag slave. ignore\n", __func__, port);
return portmask; return portmask;
} }
portmask &= ~BIT_ULL(port);
priv->r->write_mcast_pmask(mc_group, portmask); priv->r->write_mcast_pmask(mc_group, portmask);
if (portmask == BIT_ULL(priv->cpu_port)) { if (portmask == BIT_ULL(priv->cpu_port)) {
portmask &= ~BIT_ULL(priv->cpu_port); portmask &= ~BIT_ULL(priv->cpu_port);