net: dsa: Move FDB dump implementation inside DSA

>From all switchdev devices only DSA requires special FDB dump. This is due
to lack of ability for syncing the hardware learned FDBs with the bridge.
Due to this it is removed from switchdev and moved inside DSA.

Signed-off-by: Arkadi Sharshevsky <arkadis@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 6 insertions, 14 deletions

diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c
index 4de9d90a4bb3..56cd6d365352 100644
--- a/drivers/net/dsa/microchip/ksz_common.c
+++ b/drivers/net/dsa/microchip/ksz_common.c
@@ -805,12 +805,11 @@ static void convert_alu(struct alu_struct *alu, u32 *alu_table)
 }
 
 static int ksz_port_fdb_dump(struct dsa_switch *ds, int port,
-                             struct switchdev_obj_port_fdb *fdb,
-                             switchdev_obj_dump_cb_t *cb)
+                             dsa_fdb_dump_cb_t *cb, void *data)
 {
         struct ksz_device *dev = ds->priv;
         int ret = 0;
-        u32 data;
+        u32 ksz_data;
         u32 alu_table[4];
         struct alu_struct alu;
         int timeout;
@@ -823,8 +822,8 @@ static int ksz_port_fdb_dump(struct dsa_switch *ds, int port,
         do {
                 timeout = 1000;
                 do {
-                        ksz_read32(dev, REG_SW_ALU_CTRL__4, &data);
-                        if ((data & ALU_VALID) || !(data & ALU_START))
+                        ksz_read32(dev, REG_SW_ALU_CTRL__4, &ksz_data);
+                        if ((ksz_data & ALU_VALID) || !(ksz_data & ALU_START))
                                 break;
                         usleep_range(1, 10);
                 } while (timeout-- > 0);
@@ -841,18 +840,11 @@ static int ksz_port_fdb_dump(struct dsa_switch *ds, int port,
                 convert_alu(&alu, alu_table);
 
                 if (alu.port_forward & BIT(port)) {
-                        fdb->vid = alu.fid;
-                        if (alu.is_static)
-                                fdb->ndm_state = NUD_NOARP;
-                        else
-                                fdb->ndm_state = NUD_REACHABLE;
-                        ether_addr_copy(fdb->addr, alu.mac);
-
-                        ret = cb(&fdb->obj);
+                        ret = cb(alu.mac, alu.fid, alu.is_static, data);
                         if (ret)
                                 goto exit;
                 }
-        } while (data & ALU_START);
+        } while (ksz_data & ALU_START);
 
 exit: