ar8216: set the pvid based on runtime state instead of port number to fix learning...
[openwrt/staging/chunkeey.git] / target / linux / generic / files / drivers / net / phy / ar8216.c
index bd6cc97d55639d7fd70d8bc77e73af0e7a3820fb..c7adc3d893cf0291605b798a89de9c17247299c2 100644 (file)
@@ -1763,14 +1763,12 @@ ar8327_setup_port(struct ar8xxx_priv *priv, int port, u32 members)
 {
        u32 t;
        u32 egress, ingress;
 {
        u32 t;
        u32 egress, ingress;
-       u32 pvid;
+       u32 pvid = priv->vlan_id[priv->pvid[port]];
 
        if (priv->vlan) {
 
        if (priv->vlan) {
-               pvid = priv->vlan_id[priv->pvid[port]];
                egress = AR8327_PORT_VLAN1_OUT_MODE_UNMOD;
                ingress = AR8216_IN_SECURE;
        } else {
                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;
        }
                egress = AR8327_PORT_VLAN1_OUT_MODE_UNTOUCH;
                ingress = AR8216_IN_PORT_ONLY;
        }