From 61f111b2bd18485d8bf49370af655423243321c3 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 31 Aug 2010 19:05:33 +0000 Subject: [PATCH] rtl8366_smi: backport vlan fix from r22856 SVN-Revision: 22857 --- .../generic-2.6/files/drivers/net/phy/rtl8366_smi.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/target/linux/generic-2.6/files/drivers/net/phy/rtl8366_smi.c b/target/linux/generic-2.6/files/drivers/net/phy/rtl8366_smi.c index c827cd20ee..d3e6b25fec 100644 --- a/target/linux/generic-2.6/files/drivers/net/phy/rtl8366_smi.c +++ b/target/linux/generic-2.6/files/drivers/net/phy/rtl8366_smi.c @@ -905,6 +905,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)) @@ -916,6 +917,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); -- 2.30.2