X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/79f8984b04af750bd6767d142360ed1516e92a67..1920dadf14e1d116bc33a5fabe83ee166e259755:/target/linux/generic-2.6/files/drivers/net/phy/mvswitch.c

diff --git a/target/linux/generic-2.6/files/drivers/net/phy/mvswitch.c b/target/linux/generic-2.6/files/drivers/net/phy/mvswitch.c
index 3e644c223..834d31217 100644
--- a/target/linux/generic-2.6/files/drivers/net/phy/mvswitch.c
+++ b/target/linux/generic-2.6/files/drivers/net/phy/mvswitch.c
@@ -235,7 +235,6 @@ mvswitch_config_init(struct phy_device *pdev)
 	/* initialize the cpu port */
 	w16(pdev, MV_PORTREG(CONTROL, MV_CPUPORT),
 		MV_PORTCTRL_ENABLED |
-		MV_PORTCTRL_VLANTUN |
 		MV_PORTCTRL_RXTR |
 		MV_PORTCTRL_TXTR
 	);
@@ -275,8 +274,8 @@ mvswitch_config_init(struct phy_device *pdev)
 	}
 
 	/* build the target list for the cpu port */
-	for (i = 0, vlmap = 0; i < ARRAY_SIZE(priv->vlans); i++)
-		vlmap |= priv->vlans[i];
+	for (i = 0; i < MV_PORTS; i++)
+		vlmap |= (1 << i);
 
 	w16(pdev, MV_PORTREG(VLANMAP, MV_CPUPORT),
 		MV_PORTVLAN_PORTS(vlmap)