mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 22:23:27 +00:00
5b089e45a6
Refresh patches on all 4.4 supported platforms. Compile & run tested: lantiq/xrx200 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
32 lines
859 B
Diff
32 lines
859 B
Diff
--- a/drivers/net/ethernet/mediatek/mt7530.c
|
|
+++ b/drivers/net/ethernet/mediatek/mt7530.c
|
|
@@ -547,6 +547,7 @@ mt7530_apply_config(struct switch_dev *d
|
|
u8 etags = priv->vlan_entries[i].etags;
|
|
u32 val;
|
|
|
|
+#ifndef CONFIG_SOC_MT7621
|
|
/* vid of vlan */
|
|
val = mt7530_r32(priv, REG_ESW_VLAN_VTIM(i));
|
|
if (i % 2 == 0) {
|
|
@@ -557,7 +558,7 @@ mt7530_apply_config(struct switch_dev *d
|
|
val |= (vid << 12);
|
|
}
|
|
mt7530_w32(priv, REG_ESW_VLAN_VTIM(i), val);
|
|
-
|
|
+#endif
|
|
/* vlan port membership */
|
|
if (member)
|
|
mt7530_w32(priv, REG_ESW_VLAN_VAWD1, REG_ESW_VLAN_VAWD1_IVL_MAC |
|
|
@@ -577,7 +578,11 @@ mt7530_apply_config(struct switch_dev *d
|
|
mt7530_w32(priv, REG_ESW_VLAN_VAWD2, val);
|
|
|
|
/* write to vlan table */
|
|
+#ifdef CONFIG_SOC_MT7621
|
|
+ mt7530_vtcr(priv, 1, vid);
|
|
+#else
|
|
mt7530_vtcr(priv, 1, i);
|
|
+#endif
|
|
}
|
|
|
|
/* Port Default PVID */
|