]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
net: dsa: rtl8366: Skip PVID setting if not requested
authorLinus Walleij <linus.walleij@linaro.org>
Fri, 18 Sep 2020 22:29:54 +0000 (00:29 +0200)
committerDavid S. Miller <davem@davemloft.net>
Sun, 20 Sep 2020 21:10:58 +0000 (14:10 -0700)
We go to lengths to determine whether the PVID should be set
for this port or not, and then fail to take it into account.
Fix this oversight.

Fixes: d8652956cf37 ("net: dsa: realtek-smi: Add Realtek SMI driver")
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/dsa/rtl8366.c

index 2dcde7a917211f749d1eeaddf8b784670264ff9f..7c09ed747bc0fe403e0d2f83c57ae10daa9487c1 100644 (file)
@@ -436,6 +436,9 @@ void rtl8366_vlan_add(struct dsa_switch *ds, int port,
                                "failed to set up VLAN %04x",
                                vid);
 
+               if (!pvid)
+                       continue;
+
                ret = rtl8366_set_pvid(smi, port, vid);
                if (ret)
                        dev_err(smi->dev,