net: dsa: Remove support for MDB dump from DSA's drivers
authorArkadi Sharshevsky <arkadis@mellanox.com>
Sun, 6 Aug 2017 13:15:47 +0000 (16:15 +0300)
committerDavid S. Miller <davem@davemloft.net>
Mon, 7 Aug 2017 21:48:48 +0000 (14:48 -0700)
This is done as a preparation before removing support for MDB dump from
DSA core. The MDBs are synced with the bridge and thus there is no
need for special dump operation support.

Signed-off-by: Arkadi Sharshevsky <arkadis@mellanox.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/dsa/microchip/ksz_common.c
drivers/net/dsa/mv88e6xxx/chip.c

index a53ce59e0442d5f1d5e97b5f63fe23810244f187..4de9d90a4bb3365f7f0c70ae900908c7833289d2 100644 (file)
@@ -1020,14 +1020,6 @@ exit:
        return ret;
 }
 
-static int ksz_port_mdb_dump(struct dsa_switch *ds, int port,
-                            struct switchdev_obj_port_mdb *mdb,
-                            switchdev_obj_dump_cb_t *cb)
-{
-       /* this is not called by switch layer */
-       return 0;
-}
-
 static int ksz_port_mirror_add(struct dsa_switch *ds, int port,
                               struct dsa_mall_mirror_tc_entry *mirror,
                               bool ingress)
@@ -1090,7 +1082,6 @@ static const struct dsa_switch_ops ksz_switch_ops = {
        .port_mdb_prepare       = ksz_port_mdb_prepare,
        .port_mdb_add           = ksz_port_mdb_add,
        .port_mdb_del           = ksz_port_mdb_del,
-       .port_mdb_dump          = ksz_port_mdb_dump,
        .port_mirror_add        = ksz_port_mirror_add,
        .port_mirror_del        = ksz_port_mirror_del,
 };
index 5bb1138818ef40e9e18cde80ed75adc87cece614..1f5c202b974d8f1be4b243764c09a47c001d1ef2 100644 (file)
@@ -1414,15 +1414,6 @@ static int mv88e6xxx_port_db_dump_fid(struct mv88e6xxx_chip *chip,
                                fdb->ndm_state = NUD_NOARP;
                        else
                                fdb->ndm_state = NUD_REACHABLE;
-               } else if (obj->id == SWITCHDEV_OBJ_ID_PORT_MDB) {
-                       struct switchdev_obj_port_mdb *mdb;
-
-                       if (!is_multicast_ether_addr(addr.mac))
-                               continue;
-
-                       mdb = SWITCHDEV_OBJ_PORT_MDB(obj);
-                       mdb->vid = vid;
-                       ether_addr_copy(mdb->addr, addr.mac);
                } else {
                        return -EOPNOTSUPP;
                }
@@ -3800,20 +3791,6 @@ static int mv88e6xxx_port_mdb_del(struct dsa_switch *ds, int port,
        return err;
 }
 
-static int mv88e6xxx_port_mdb_dump(struct dsa_switch *ds, int port,
-                                  struct switchdev_obj_port_mdb *mdb,
-                                  switchdev_obj_dump_cb_t *cb)
-{
-       struct mv88e6xxx_chip *chip = ds->priv;
-       int err;
-
-       mutex_lock(&chip->reg_lock);
-       err = mv88e6xxx_port_db_dump(chip, port, &mdb->obj, cb);
-       mutex_unlock(&chip->reg_lock);
-
-       return err;
-}
-
 static const struct dsa_switch_ops mv88e6xxx_switch_ops = {
        .probe                  = mv88e6xxx_drv_probe,
        .get_tag_protocol       = mv88e6xxx_get_tag_protocol,
@@ -3847,7 +3824,6 @@ static const struct dsa_switch_ops mv88e6xxx_switch_ops = {
        .port_mdb_prepare       = mv88e6xxx_port_mdb_prepare,
        .port_mdb_add           = mv88e6xxx_port_mdb_add,
        .port_mdb_del           = mv88e6xxx_port_mdb_del,
-       .port_mdb_dump          = mv88e6xxx_port_mdb_dump,
        .crosschip_bridge_join  = mv88e6xxx_crosschip_bridge_join,
        .crosschip_bridge_leave = mv88e6xxx_crosschip_bridge_leave,
 };