Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 180b072e authored by Arkadi Sharshevsky's avatar Arkadi Sharshevsky Committed by David S. Miller
Browse files

net: dsa: Remove support for MDB dump from DSA's drivers 



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: default avatarArkadi Sharshevsky <arkadis@mellanox.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c069fcd8

drivers/net/dsa/microchip/ksz_common.c

+0 −9
Original line number Original line Diff line number Diff line
@@ -1020,14 +1020,6 @@ static int ksz_port_mdb_del(struct dsa_switch *ds, int port, 
	return ret;

	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,

static int ksz_port_mirror_add(struct dsa_switch *ds, int port,

			       struct dsa_mall_mirror_tc_entry *mirror,

			       struct dsa_mall_mirror_tc_entry *mirror,

			       bool ingress)

			       bool ingress)
@@ -1090,7 +1082,6 @@ static const struct dsa_switch_ops ksz_switch_ops = { 
	.port_mdb_prepare       = ksz_port_mdb_prepare,

	.port_mdb_prepare       = ksz_port_mdb_prepare,

	.port_mdb_add           = ksz_port_mdb_add,

	.port_mdb_add           = ksz_port_mdb_add,

	.port_mdb_del           = ksz_port_mdb_del,

	.port_mdb_del           = ksz_port_mdb_del,

	.port_mdb_dump          = ksz_port_mdb_dump,

	.port_mirror_add	= ksz_port_mirror_add,

	.port_mirror_add	= ksz_port_mirror_add,

	.port_mirror_del	= ksz_port_mirror_del,

	.port_mirror_del	= ksz_port_mirror_del,

};

};

drivers/net/dsa/mv88e6xxx/chip.c

+0 −24
Original line number Original line Diff line number Diff line
@@ -1414,15 +1414,6 @@ static int mv88e6xxx_port_db_dump_fid(struct mv88e6xxx_chip *chip, 
				fdb->ndm_state = NUD_NOARP;

				fdb->ndm_state = NUD_NOARP;

			else

			else

				fdb->ndm_state = NUD_REACHABLE;

				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 {

		} else {

			return -EOPNOTSUPP;

			return -EOPNOTSUPP;

		}

		}
@@ -3800,20 +3791,6 @@ static int mv88e6xxx_port_mdb_del(struct dsa_switch *ds, int port, 
	return err;

	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 = {

static const struct dsa_switch_ops mv88e6xxx_switch_ops = {

	.probe			= mv88e6xxx_drv_probe,

	.probe			= mv88e6xxx_drv_probe,

	.get_tag_protocol	= mv88e6xxx_get_tag_protocol,

	.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_prepare       = mv88e6xxx_port_mdb_prepare,

	.port_mdb_add           = mv88e6xxx_port_mdb_add,

	.port_mdb_add           = mv88e6xxx_port_mdb_add,

	.port_mdb_del           = mv88e6xxx_port_mdb_del,

	.port_mdb_del           = mv88e6xxx_port_mdb_del,

	.port_mdb_dump          = mv88e6xxx_port_mdb_dump,

	.crosschip_bridge_join	= mv88e6xxx_crosschip_bridge_join,

	.crosschip_bridge_join	= mv88e6xxx_crosschip_bridge_join,

	.crosschip_bridge_leave	= mv88e6xxx_crosschip_bridge_leave,

	.crosschip_bridge_leave	= mv88e6xxx_crosschip_bridge_leave,

};

};