Commit 4ddcaf1e authored Sep 05, 2020 by Linus Walleij Committed by Jakub Kicinski Sep 06, 2020

net: dsa: rtl8366: Properly clear member config



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: d8652956 ("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>

parent d7739b0b

drivers/net/dsa/rtl8366.c

+13 −7

Original line number	Diff line number	Diff line
		@@ -452,13 +452,19 @@ int rtl8366_vlan_del(struct dsa_switch *ds, int port,
		return ret;

		if (vid == vlanmc.vid) {
		/* clear VLAN member configurations */
		/* Remove this port from the VLAN */
		vlanmc.member &= ~BIT(port);
		vlanmc.untag &= ~BIT(port);
		/*
		* If no ports are members of this VLAN
		* anymore then clear the whole member
		* config so it can be reused.
		*/
		if (!vlanmc.member && vlanmc.untag) {
		vlanmc.vid = 0;
		vlanmc.priority = 0;
		vlanmc.member = 0;
		vlanmc.untag = 0;
		vlanmc.fid = 0;

		}
		ret = smi->ops->set_vlan_mc(smi, i, &vlanmc);
		if (ret) {
		dev_err(smi->dev,

Admin message