diff options
| author | Vladimir Oltean <vladimir.oltean@nxp.com> | 2020-05-12 19:20:31 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-12 22:08:08 +0200 |
| commit | cfa36b1fff422660fe7fc3a10c17a618d0371796 (patch) | |
| tree | e2d2ed1d597ea566ddbfe75693dc0c2770baa528 /drivers/net/dsa | |
| parent | net: dsa: sja1105: allow VLAN configuration from the bridge in all states (diff) | |
| download | linux-cfa36b1fff422660fe7fc3a10c17a618d0371796.tar.xz linux-cfa36b1fff422660fe7fc3a10c17a618d0371796.zip | |
net: dsa: sja1105: exit sja1105_vlan_filtering when called multiple times
VLAN filtering is a global property for sja1105, and that means that we
rely on the DSA core to not call us more than once.
But we need to introduce some per-port state for the tagger, namely the
xmit_tpid, and the best place to do that is where the xmit_tpid changes,
namely in sja1105_vlan_filtering. So at the moment, exit early from the
function to avoid unnecessarily resetting the switch for each port call.
Then we'll change the xmit_tpid prior to the early exit in the next
patch.
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/dsa')
| -rw-r--r-- | drivers/net/dsa/sja1105/sja1105_main.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/dsa/sja1105/sja1105_main.c b/drivers/net/dsa/sja1105/sja1105_main.c index ca5a9baa0b2f..7b9c3db98e1d 100644 --- a/drivers/net/dsa/sja1105/sja1105_main.c +++ b/drivers/net/dsa/sja1105/sja1105_main.c @@ -2158,6 +2158,9 @@ static int sja1105_vlan_filtering(struct dsa_switch *ds, int port, bool enabled) else state = SJA1105_VLAN_FILTERING_FULL; + if (priv->vlan_state == state) + return 0; + priv->vlan_state = state; table = &priv->static_config.tables[BLK_IDX_GENERAL_PARAMS]; |