Commit b11f0a4c authored by Vladimir Oltean's avatar Vladimir Oltean Committed by David S. Miller
Browse files

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: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b0fdb999

drivers/net/dsa/sja1105/sja1105_dynamic_config.c

+3 −3
Original line number Diff line number Diff line
@@ -1354,14 +1354,14 @@ u8 sja1105et_fdb_hash(struct sja1105_private *priv, const u8 *addr, u16 vid) 
{

	struct sja1105_l2_lookup_params_entry *l2_lookup_params =

		priv->static_config.tables[BLK_IDX_L2_LOOKUP_PARAMS].entries;

	u64 poly_koopman = l2_lookup_params->poly;

	u64 input, poly_koopman = l2_lookup_params->poly;

	/* Convert polynomial from Koopman to 'normal' notation */

	u8 poly = (u8)(1 + (poly_koopman << 1));

	u64 vlanid = l2_lookup_params->shared_learn ? 0 : vid;

	u64 input = (vlanid << 48) | ether_addr_to_u64(addr);

	u8 crc = 0; /* seed */

	int i;



	input = ((u64)vid << 48) | ether_addr_to_u64(addr);



	/* Mask the eight bytes starting from MSB one at a time */

	for (i = 56; i >= 0; i -= 8) {

		u8 byte = (input & (0xffull << i)) >> i;

drivers/net/dsa/sja1105/sja1105_main.c

+0 −15
Original line number Diff line number Diff line
@@ -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);

}