diff options
| author |   Vladimir Oltean <olteanv@gmail.com> | 2019-08-05 01:38:45 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-08-06 14:37:02 -0700 |
| commit | 4b7da3d808f91cdad3e34059cd68ba3dfe4c3695 (patch) | |
| tree | 280665825ed865f8e84500da867202beb3e189ef /drivers/net/dsa/sja1105/sja1105_main.c | |
| parent | net: dsa: sja1105: Fix broken learning with vlan_filtering disabled (diff) | |
| download | linux-dev-4b7da3d808f91cdad3e34059cd68ba3dfe4c3695.tar.xz linux-dev-4b7da3d808f91cdad3e34059cd68ba3dfe4c3695.zip | |
net: dsa: sja1105: Use the LOCKEDS bit for SJA1105 E/T as well
It looks like the FDB dump taken from first-generation switches also
contains information on whether entries are static or not. So use that
instead of searching through the driver's tables.
Fixes: d763778224ea ("net: dsa: sja1105: Implement is_static for FDB entries on E/T")
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')
| -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 b6d8ef0ab879..a573ae136ebd 100644 --- a/drivers/net/dsa/sja1105/sja1105_main.c +++ b/drivers/net/dsa/sja1105/sja1105_main.c @@ -1254,21 +1254,6 @@ static int sja1105_fdb_dump(struct dsa_switch *ds, int port, continue; u64_to_ether_addr(l2_lookup.macaddr, macaddr); - /* On SJA1105 E/T, the switch doesn't implement the LOCKEDS - * bit, so it doesn't tell us whether a FDB entry is static - * or not. - * But, of course, we can find out - we're the ones who added - * it in the first place. - */ - if (priv->info->device_id == SJA1105E_DEVICE_ID || - priv->info->device_id == SJA1105T_DEVICE_ID) { - int match; - - match = sja1105_find_static_fdb_entry(priv, port, - &l2_lookup); - l2_lookup.lockeds = (match >= 0); - } - /* We need to hide the dsa_8021q VLANs from the user. */ if (!dsa_port_is_vlan_filtering(&ds->ports[port])) l2_lookup.vlanid = 0; |