From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 31 Aug 2010 19:04:02 +0000 (+0000)
Subject: rtl8366_smi: when setting VLAN ports, always initialize the PVID to ensure that the... 
X-Git-Tag: reboot~19021
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=08755b8858df151970fa88f95ea459b54a5f5556;p=openwrt%2Fstaging%2Fxback.git

rtl8366_smi: when setting VLAN ports, always initialize the PVID to ensure that the VLAN MC entry gets allocated. Fixes problems with tagged-only ports (#7795)

SVN-Revision: 22856
---

diff --git a/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c b/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c
index 9b70a9282a..dc83ba7d42 100644
--- a/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c
+++ b/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c
@@ -946,6 +946,7 @@ int rtl8366_sw_set_vlan_ports(struct switch_dev *dev, struct switch_val *val)
 	struct switch_port *port;
 	u32 member = 0;
 	u32 untag = 0;
+	int err;
 	int i;
 
 	if (!smi->ops->is_vlan_valid(smi, val->port_vlan))
@@ -957,6 +958,14 @@ int rtl8366_sw_set_vlan_ports(struct switch_dev *dev, struct switch_val *val)
 
 		if (!(port->flags & BIT(SWITCH_PORT_FLAG_TAGGED)))
 			untag |= BIT(port->id);
+
+		/*
+		 * To ensure that we have a valid MC entry for this VLAN,
+		 * initialize the port VLAN ID here.
+		 */
+		err = rtl8366_set_pvid(smi, port->id, val->port_vlan);
+		if (err < 0)
+			return err;
 	}
 
 	return rtl8366_set_vlan(smi, val->port_vlan, member, untag, 0);