[PATCH v1 09/26] net: dsa: microchip: ksz8_r_dyn_mac_table(): remove fid support
From: Oleksij Rempel
Date: Mon Nov 28 2022 - 07:03:59 EST
FID != VLAN. FID to VLAN conversation is currently not validated and was
not working before within the FDB dump context. So, drop it until
we have time to implement this functionality.
Signed-off-by: Oleksij Rempel <o.rempel@xxxxxxxxxxxxxx>
---
drivers/net/dsa/microchip/ksz8795.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/net/dsa/microchip/ksz8795.c b/drivers/net/dsa/microchip/ksz8795.c
index 7310abd0d8df..736cf4e54333 100644
--- a/drivers/net/dsa/microchip/ksz8795.c
+++ b/drivers/net/dsa/microchip/ksz8795.c
@@ -395,7 +395,7 @@ static int ksz8_valid_dyn_entry(struct ksz_device *dev, u8 *data)
}
static int ksz8_r_dyn_mac_table(struct ksz_device *dev, u16 addr, u8 *mac_addr,
- u8 *fid, u8 *src_port, u16 *entries)
+ u8 *src_port, u16 *entries)
{
u32 data_hi, data_lo;
const u8 *shifts;
@@ -436,8 +436,6 @@ static int ksz8_r_dyn_mac_table(struct ksz_device *dev, u16 addr, u8 *mac_addr,
shifts[DYNAMIC_MAC_ENTRIES];
*entries = cnt + 1;
- *fid = (data_hi & masks[DYNAMIC_MAC_TABLE_FID]) >>
- shifts[DYNAMIC_MAC_FID];
*src_port = (data_hi & masks[DYNAMIC_MAC_TABLE_SRC_PORT]) >>
shifts[DYNAMIC_MAC_SRC_PORT];
@@ -954,12 +952,11 @@ int ksz8_fdb_dump(struct ksz_device *dev, int port,
int ret = 0;
u16 i = 0;
u16 entries = 0;
- u8 fid;
u8 src_port;
u8 mac[ETH_ALEN];
do {
- ret = ksz8_r_dyn_mac_table(dev, i, mac, &fid, &src_port,
+ ret = ksz8_r_dyn_mac_table(dev, i, mac, &src_port,
&entries);
if (!ret && port == src_port) {
ret = cb(mac, 0, false, data);
--
2.30.2