aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/files/drivers
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-10-02 20:00:41 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-10-02 20:00:41 +0000
commit156b296b20f64d2a03bda8c74ac1d243efe9c9a7 (patch)
treed4cfb9e88a0ac111dc4e356dc15974a8d95455cc /target/linux/generic/files/drivers
parent64e3cb9fe8122117d8888022399a0d5ea116e2d0 (diff)
downloadupstream-156b296b20f64d2a03bda8c74ac1d243efe9c9a7.tar.gz
upstream-156b296b20f64d2a03bda8c74ac1d243efe9c9a7.tar.bz2
upstream-156b296b20f64d2a03bda8c74ac1d243efe9c9a7.zip
ar8216: set the pvid based on runtime state instead of port number to fix learning with enable_vlan = 0
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 42753
Diffstat (limited to 'target/linux/generic/files/drivers')
-rw-r--r--target/linux/generic/files/drivers/net/phy/ar8216.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/target/linux/generic/files/drivers/net/phy/ar8216.c b/target/linux/generic/files/drivers/net/phy/ar8216.c
index bd6cc97d55..c7adc3d893 100644
--- a/target/linux/generic/files/drivers/net/phy/ar8216.c
+++ b/target/linux/generic/files/drivers/net/phy/ar8216.c
@@ -1763,14 +1763,12 @@ ar8327_setup_port(struct ar8xxx_priv *priv, int port, u32 members)
{
u32 t;
u32 egress, ingress;
- u32 pvid;
+ u32 pvid = priv->vlan_id[priv->pvid[port]];
if (priv->vlan) {
- pvid = priv->vlan_id[priv->pvid[port]];
egress = AR8327_PORT_VLAN1_OUT_MODE_UNMOD;
ingress = AR8216_IN_SECURE;
} else {
- pvid = port;
egress = AR8327_PORT_VLAN1_OUT_MODE_UNTOUCH;
ingress = AR8216_IN_PORT_ONLY;
}