KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

generic: rtl8366_smi: only assign pvid if no pvid was set yet

Browse source 
Only assign a pvid if the current pvid is 0. Fixes using mixed tagged
and untagged traffic on a port and the untagged vlan isn't the last one
of which the port is a member.

Tested on RTL8366S and RTL8367R.

Fixes #8501.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>

SVN-Revision: 35227
This commit is contained in:
Jonas Gorski 2013-01-18 15:19:11 +00:00
parent 62e9957cc4
commit c3eeff807f
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
target/linux/generic/files/drivers/net/phy/rtl8366_smi.c
View file

@ -1109,6 +1109,7 @@ int rtl8366_sw_set_vlan_ports(struct switch_dev *dev, struct switch_val *val)
port = &val->value.ports[0];
for (i = 0; i < val->len; i++, port++) {
int pvid;
member |= BIT(port->id);
if (!(port->flags & BIT(SWITCH_PORT_FLAG_TAGGED)))
@ -1118,9 +1119,14 @@ int rtl8366_sw_set_vlan_ports(struct switch_dev *dev, struct switch_val *val)
* 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);
err = rtl8366_get_pvid(smi, port->id, &pvid);
if (err < 0)
return err;
if (pvid == 0) {
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);