X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/f12451cca68d1bd1839fc384348cef9b21d0aa52..0f2df09b10ca2adf5391dbf1d95c1f1b0b54d4ea:/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 27c0920bb..cb0d377d2 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
@@ -274,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)
@@ -288,6 +288,12 @@ mvswitch_config_init(struct phy_device *pdev)
 		);
 	}
 
+	/* init switch control */
+	w16(pdev, MV_SWITCHREG(CTRL),
+		MV_SWITCHCTL_MSIZE |
+		MV_SWITCHCTL_DROP
+	);
+
 	/* hook into the tx function */
 	priv->hardstart = dev->hard_start_xmit;
 	pdev->netif_receive_skb = mvswitch_netif_receive_skb;