From: INAGAKI Hiroshi Date: Mon, 4 Apr 2022 12:57:43 +0000 (+0900) Subject: realtek: fix place of fdb/mdb info messages X-Git-Tag: v23.05.0-rc1~2187 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ff307f52f54e643ff72b50012a012f3e4ab2f0bc;p=openwrt%2Fstaging%2Fhauke.git realtek: fix place of fdb/mdb info messages Those messages should be printed when entry was found (idx >= 0). Move them to the right place to not print invalid entry indices. Signed-off-by: INAGAKI Hiroshi [amden commit message] Signed-off-by: Sander Vanheule --- diff --git a/target/linux/realtek/files-5.10/drivers/net/dsa/rtl83xx/dsa.c b/target/linux/realtek/files-5.10/drivers/net/dsa/rtl83xx/dsa.c index f54fdd298a..f08ede730b 100644 --- a/target/linux/realtek/files-5.10/drivers/net/dsa/rtl83xx/dsa.c +++ b/target/linux/realtek/files-5.10/drivers/net/dsa/rtl83xx/dsa.c @@ -1689,8 +1689,8 @@ static int rtl83xx_port_fdb_del(struct dsa_switch *ds, int port, idx = rtl83xx_find_l2_hash_entry(priv, seed, true, &e); - pr_info("Found entry index %d, key %d and bucket %d\n", idx, idx >> 2, idx & 3); if (idx >= 0) { + pr_info("Found entry index %d, key %d and bucket %d\n", idx, idx >> 2, idx & 3); e.valid = false; dump_l2_entry(&e); priv->r->write_l2_entry_using_hash(idx >> 2, idx & 0x3, &e); @@ -1870,8 +1870,8 @@ int rtl83xx_port_mdb_del(struct dsa_switch *ds, int port, idx = rtl83xx_find_l2_hash_entry(priv, seed, true, &e); - pr_debug("Found entry index %d, key %d and bucket %d\n", idx, idx >> 2, idx & 3); if (idx >= 0) { + pr_debug("Found entry index %d, key %d and bucket %d\n", idx, idx >> 2, idx & 3); portmask = rtl83xx_mc_group_del_port(priv, e.mc_portmask_index, port); if (!portmask) { e.valid = false;