From a9266bc68248641535d5548c0e9d33a7d6eafa44 Mon Sep 17 00:00:00 2001 From: nbd Date: Tue, 31 Aug 2010 19:04:02 +0000 Subject: 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) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22856 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/generic/files/drivers/net/phy/rtl8366_smi.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'target/linux') 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); -- cgit v1.2.3