net: dsa: rtl8366: Fix a bug in deleting VLANs
authorLinus Walleij <linus.walleij@linaro.org>
Sat, 25 Sep 2021 22:59:28 +0000 (00:59 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 18 Nov 2021 18:16:26 +0000 (19:16 +0100)
[ Upstream commit d8251b9db34a2cbc5619b610e7e8aad1d165c531 ]

We were checking that the MC (member config) was != 0
for some reason, all we need to check is that the config
has no ports, i.e. no members. Then it can be recycled.
This must be some misunderstanding.

Fixes: 4ddcaf1ebb5e ("net: dsa: rtl8366: Properly clear member config")
Cc: Mauri Sandberg <sandberg@mailfence.com>
Cc: DENG Qingfang <dqfext@gmail.com>
Reviewed-by: Alvin Šipraga <alsi@bang-olufsen.dk>
Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/dsa/rtl8366.c

index 75897a3690969fdc5f4e5fcb2dd523d2900530a6..ffbe5b6b2655b6b56b2816eb5a93209623f80f1a 100644 (file)
@@ -457,7 +457,7 @@ int rtl8366_vlan_del(struct dsa_switch *ds, int port,
                         * anymore then clear the whole member
                         * config so it can be reused.
                         */
-                       if (!vlanmc.member && vlanmc.untag) {
+                       if (!vlanmc.member) {
                                vlanmc.vid = 0;
                                vlanmc.priority = 0;
                                vlanmc.fid = 0;