From: Linus Walleij <linus.walleij@linaro.org>
Date: Fri, 18 Sep 2020 22:29:54 +0000 (+0200)
Subject: net: dsa: rtl8366: Skip PVID setting if not requested
X-Git-Tag: v5.10-rc1~107^2~199
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3dfe8dde093a07e82fa472c0f8c29a7f6a2006a5;p=thirdparty%2Fkernel%2Flinux.git

net: dsa: rtl8366: Skip PVID setting if not requested

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>
---

diff --git a/drivers/net/dsa/rtl8366.c b/drivers/net/dsa/rtl8366.c
index 2dcde7a917211..7c09ed747bc0f 100644
--- a/drivers/net/dsa/rtl8366.c
+++ b/drivers/net/dsa/rtl8366.c
@@ -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,