diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2013-01-18 15:19:11 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2013-01-18 15:19:11 +0000 |
| commit | aecebbaed2129f3029dbc2e12bd00bcac1bdf264 (patch) | |
| tree | 35971424933efff6422e77596408193aeecfb760 /target/linux/generic/files/drivers | |
| parent | 2a6b173e6d612a4ec8bce52e8edfce767b5a6dff (diff) | |
| download | upstream-aecebbaed2129f3029dbc2e12bd00bcac1bdf264.tar.gz upstream-aecebbaed2129f3029dbc2e12bd00bcac1bdf264.tar.bz2 upstream-aecebbaed2129f3029dbc2e12bd00bcac1bdf264.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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35227 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/files/drivers')
| -rw-r--r-- | target/linux/generic/files/drivers/net/phy/rtl8366_smi.c | 8 |
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); |