mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-30 22:26:55 +00:00
Code Issues Releases Wiki Activity

net: dsa: rtl8366: Properly clear member config

Browse source 
When removing a port from a VLAN we are just erasing the
member config for the VLAN, which is wrong: other ports
can be using it.

Just mask off the port and only zero out the rest of the
member config once ports using of the VLAN are removed
from it.

Reported-by: Florian Fainelli <f.fainelli@gmail.com>
Fixes: d8652956cf ("net: dsa: realtek-smi: Add Realtek SMI driver")
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Linus Walleij 2020-09-05 12:32:33 +02:00 committed by Jakub Kicinski
parent d7739b0b6d
commit 4ddcaf1ebb
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
drivers/net/dsa/rtl8366.c
View file

@ -452,13 +452,19 @@ int rtl8366_vlan_del(struct dsa_switch *ds, int port,
return ret; return ret;
if (vid == vlanmc.vid) { if (vid == vlanmc.vid) {
/* clear VLAN member configurations */ /* Remove this port from the VLAN */
vlanmc.vid = 0; vlanmc.member &= ~BIT(port);
vlanmc.priority = 0; vlanmc.untag &= ~BIT(port);
vlanmc.member = 0; /*
vlanmc.untag = 0; * If no ports are members of this VLAN
vlanmc.fid = 0; * anymore then clear the whole member
* config so it can be reused.
*/
if (!vlanmc.member && vlanmc.untag) {
vlanmc.vid = 0;
vlanmc.priority = 0;
vlanmc.fid = 0;
}
ret = smi->ops->set_vlan_mc(smi, i, &vlanmc); ret = smi->ops->set_vlan_mc(smi, i, &vlanmc);
if (ret) { if (ret) {
dev_err(smi->dev, dev_err(smi->dev,