diff options
| author | Vladimir Oltean <vladimir.oltean@nxp.com> | 2021-07-28 21:53:15 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-07-28 22:28:01 +0300 |
| commit | b11f0a4c0c81ff062cd3696eadd46266489bca8e (patch) | |
| tree | c2321dca7cfb5b3d430646607aad9364b8630fda /drivers/net/dsa/sja1105/sja1105_main.c | |
| parent | b0fdb99943bec486fe8f51f7065a4719325545f5 (diff) | |
| download | linux-b11f0a4c0c81ff062cd3696eadd46266489bca8e.tar.xz | |
net: dsa: sja1105: be stateless when installing FDB entries
Currently there are issues when adding a bridge FDB entry as VLAN-aware
and deleting it as VLAN-unaware, or vice versa.
However this is an unneeded complication, since the bridge always
installs its default FDB entries in VLAN 0 to match on VLAN-unaware
ports, and in the default_pvid (VLAN 1) to match on VLAN-aware ports.
So instead of trying to outsmart the bridge, just install all entries it
gives us, and they will start matching packets when the vlan_filtering
mode changes.
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/dsa/sja1105/sja1105_main.c')
| -rw-r--r-- | drivers/net/dsa/sja1105/sja1105_main.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/drivers/net/dsa/sja1105/sja1105_main.c b/drivers/net/dsa/sja1105/sja1105_main.c index da042e211dda..3047704c24d3 100644 --- a/drivers/net/dsa/sja1105/sja1105_main.c +++ b/drivers/net/dsa/sja1105/sja1105_main.c @@ -1501,18 +1501,6 @@ static int sja1105_fdb_add(struct dsa_switch *ds, int port, { struct sja1105_private *priv = ds->priv; - /* dsa_8021q is in effect when the bridge's vlan_filtering isn't, - * so the switch still does some VLAN processing internally. - * But Shared VLAN Learning (SVL) is also active, and it will take - * care of autonomous forwarding between the unique pvid's of each - * port. Here we just make sure that users can't add duplicate FDB - * entries when in this mode - the actual VID doesn't matter except - * for what gets printed in 'bridge fdb show'. In the case of zero, - * no VID gets printed at all. - */ - if (!priv->vlan_aware) - vid = 0; - return priv->info->fdb_add_cmd(ds, port, addr, vid); } @@ -1521,9 +1509,6 @@ static int sja1105_fdb_del(struct dsa_switch *ds, int port, { struct sja1105_private *priv = ds->priv; - if (!priv->vlan_aware) - vid = 0; - return priv->info->fdb_del_cmd(ds, port, addr, vid); } |