@@ -1421,8 +1421,8 @@ static int sja1105_vlan_filtering(struct dsa_switch *ds, int port, bool enabled)
if (enabled) {
/* Enable VLAN filtering. */
- tpid = ETH_P_8021Q;
- tpid2 = ETH_P_8021AD;
+ tpid = ETH_P_8021AD;
+ tpid2 = ETH_P_8021Q;
} else {
/* Disable VLAN filtering. */
tpid = ETH_P_SJA1105;
@@ -1431,7 +1431,9 @@ static int sja1105_vlan_filtering(struct dsa_switch *ds, int port, bool enabled)
table = &priv->static_config.tables[BLK_IDX_GENERAL_PARAMS];
general_params = table->entries;
+ /* EtherType used to identify outer tagged (S-tag) VLAN traffic */
general_params->tpid = tpid;
+ /* EtherType used to identify inner tagged (C-tag) VLAN traffic */
general_params->tpid2 = tpid2;
rc = sja1105_static_config_reload(priv);