Commit dfd739f1 authored by Christian Marangi's avatar Christian Marangi Committed by David S. Miller
Browse files

net: dsa: qca8k: fix mdb add/del case with 0 VID 



The qca8k switch doesn't support using 0 as VID and require a default
VID to be always set. MDB add/del function doesn't currently handle
this and are currently setting the default VID.

Fix this by correctly handling this corner case and internally use the
default VID for VID 0 case.

Fixes: ba8f870d ("net: dsa: qca8k: add support for mdb_add/del")
Signed-off-by: default avatarChristian Marangi <ansuelsmth@gmail.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ae70dcb9

drivers/net/dsa/qca/qca8k-common.c

+6 −0
Original line number Diff line number Diff line
@@ -816,6 +816,9 @@ int qca8k_port_mdb_add(struct dsa_switch *ds, int port, 
	const u8 *addr = mdb->addr;

	u16 vid = mdb->vid;



	if (!vid)

		vid = QCA8K_PORT_VID_DEF;



	return qca8k_fdb_search_and_insert(priv, BIT(port), addr, vid,

					   QCA8K_ATU_STATUS_STATIC);

}
@@ -828,6 +831,9 @@ int qca8k_port_mdb_del(struct dsa_switch *ds, int port, 
	const u8 *addr = mdb->addr;

	u16 vid = mdb->vid;



	if (!vid)

		vid = QCA8K_PORT_VID_DEF;



	return qca8k_fdb_search_and_del(priv, BIT(port), addr, vid);

}