path: root/drivers/net/dsa/sja1105/sja1105_main.c
diff options
authorVladimir Oltean <olteanv@gmail.com>2019-08-25 22:46:30 +0300
committerDavid S. Miller <davem@davemloft.net>2019-08-27 20:46:26 -0700
commite9bf96943b408e6c99dd13fb01cb907335787c61 (patch)
tree12d6d044df23a3c2e8361cf4ff94df97467ac567 /drivers/net/dsa/sja1105/sja1105_main.c
parentnet: dsa: Advertise the VLAN offload netdev ability only if switch supports it (diff)
net: dsa: sja1105: Clear VLAN filtering offload netdev feature
The switch barely supports traffic I/O, and it does that by repurposing VLANs when there is no bridge that is taking control of them. Letting DSA declare this netdev feature as supported (see dsa_slave_create) would mean that VLAN sub-interfaces created on sja1105 switch ports will be hardware offloaded. That means that net/8021q/vlan_core.c would install the VLAN into the filter tables of the switch, potentially interfering with the tag_8021q VLANs. We need to prevent that from happening and not let the 8021q core offload VLANs to the switch hardware tables. In vlan_filtering=0 modes of operation, the switch ports can pass through VLAN-tagged frames with no problem. Suggested-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: Vladimir Oltean <olteanv@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/dsa/sja1105/sja1105_main.c')
1 files changed, 16 insertions, 0 deletions
diff --git a/drivers/net/dsa/sja1105/sja1105_main.c b/drivers/net/dsa/sja1105/sja1105_main.c
index df976b259e43..d8cff0107ec4 100644
--- a/drivers/net/dsa/sja1105/sja1105_main.c
+++ b/drivers/net/dsa/sja1105/sja1105_main.c
@@ -1728,6 +1728,21 @@ static void sja1105_teardown(struct dsa_switch *ds)
+static int sja1105_port_enable(struct dsa_switch *ds, int port,
+ struct phy_device *phy)
+ struct net_device *slave;
+ if (!dsa_is_user_port(ds, port))
+ return 0;
+ slave = ds->ports[port].slave;
+ slave->features &= ~NETIF_F_HW_VLAN_CTAG_FILTER;
+ return 0;
static int sja1105_mgmt_xmit(struct dsa_switch *ds, int port, int slot,
struct sk_buff *skb, bool takets)
@@ -2049,6 +2064,7 @@ static const struct dsa_switch_ops sja1105_switch_ops = {
.get_ethtool_stats = sja1105_get_ethtool_stats,
.get_sset_count = sja1105_get_sset_count,
.get_ts_info = sja1105_get_ts_info,
+ .port_enable = sja1105_port_enable,
.port_fdb_dump = sja1105_fdb_dump,
.port_fdb_add = sja1105_fdb_add,
.port_fdb_del = sja1105_fdb_del,