Commit 4db4c3ea authored by Kurt Kanzenbach's avatar Kurt Kanzenbach Committed by Jakub Kicinski
Browse files

net: dsa: hellcreek: Fix insertion of static FDB entries 



The insertion of static FDB entries ignores the pass_blocked bit. That bit is
evaluated with regards to STP. Add the missing functionality.

Fixes: e4b27ebc ("net: dsa: Add DSA driver for Hirschmann Hellcreek switches")
Signed-off-by: default avatarKurt Kanzenbach <kurt@linutronix.de>
Reviewed-by: default avatarVladimir Oltean <olteanv@gmail.com>
Acked-by: default avatarRichard Cochran <richardcochran@gmail.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 9280ac2e

drivers/net/dsa/hirschmann/hellcreek.c

+5 −2
Original line number Diff line number Diff line
@@ -711,8 +711,9 @@ static int __hellcreek_fdb_add(struct hellcreek *hellcreek, 
	u16 meta = 0;



	dev_dbg(hellcreek->dev, "Add static FDB entry: MAC=%pM, MASK=0x%02x, "

		"OBT=%d, REPRIO_EN=%d, PRIO=%d\n", entry->mac, entry->portmask,

		entry->is_obt, entry->reprio_en, entry->reprio_tc);

		"OBT=%d, PASS_BLOCKED=%d, REPRIO_EN=%d, PRIO=%d\n", entry->mac,

		entry->portmask, entry->is_obt, entry->pass_blocked,

		entry->reprio_en, entry->reprio_tc);



	/* Add mac address */

	hellcreek_write(hellcreek, entry->mac[1] | (entry->mac[0] << 8), HR_FDBWDH);
@@ -723,6 +724,8 @@ static int __hellcreek_fdb_add(struct hellcreek *hellcreek, 
	meta |= entry->portmask << HR_FDBWRM0_PORTMASK_SHIFT;

	if (entry->is_obt)

		meta |= HR_FDBWRM0_OBT;

	if (entry->pass_blocked)

		meta |= HR_FDBWRM0_PASS_BLOCKED;

	if (entry->reprio_en) {

		meta |= HR_FDBWRM0_REPRIO_EN;

		meta |= entry->reprio_tc << HR_FDBWRM0_REPRIO_TC_SHIFT;