aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2013-01-18 15:19:11 +0000
committerJonas Gorski <jogo@openwrt.org>2013-01-18 15:19:11 +0000
commitc3eeff807f565f1beecb167876eb3c0c9be50f3c (patch)
tree0ee25de9c19b957f86ecc18bdf458f4a437083ad /target/linux
parent62e9957cc499a899f1a72fef6005460cadd1780a (diff)
downloadupstream-c3eeff807f565f1beecb167876eb3c0c9be50f3c.tar.gz
upstream-c3eeff807f565f1beecb167876eb3c0c9be50f3c.tar.bz2
upstream-c3eeff807f565f1beecb167876eb3c0c9be50f3c.zip
generic: rtl8366_smi: only assign pvid if no pvid was set yet
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
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/generic/files/drivers/net/phy/rtl8366_smi.c8
1 files changed, 7 insertions, 1 deletions
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 804e827dbd..d433908131 100644
--- a/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c
+++ b/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c
@@ -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);