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

Commit 8057b3e7 authored by Vivien Didelot's avatar Vivien Didelot Committed by David S. Miller
Browse files

net: dsa: use switchdev obj in port_fdb_del 



For consistency with the FDB add operation, propagate the
switchdev_obj_port_fdb structure in the DSA drivers.

Signed-off-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1f36faf2

drivers/net/dsa/mv88e6xxx.c

+2 −2
Original line number Diff line number Diff line
@@ -1870,13 +1870,13 @@ int mv88e6xxx_port_fdb_add(struct dsa_switch *ds, int port, 
}



int mv88e6xxx_port_fdb_del(struct dsa_switch *ds, int port,

			   const unsigned char *addr, u16 vid)

			   const struct switchdev_obj_port_fdb *fdb)

{

	struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);

	int ret;



	mutex_lock(&ps->smi_mutex);

	ret = _mv88e6xxx_port_fdb_load(ds, port, addr, vid,

	ret = _mv88e6xxx_port_fdb_load(ds, port, fdb->addr, fdb->vid,

				       GLOBAL_ATU_DATA_STATE_UNUSED);

	mutex_unlock(&ps->smi_mutex);

drivers/net/dsa/mv88e6xxx.h

+1 −1
Original line number Diff line number Diff line
@@ -481,7 +481,7 @@ int mv88e6xxx_port_fdb_add(struct dsa_switch *ds, int port, 
			   const struct switchdev_obj_port_fdb *fdb,

			   struct switchdev_trans *trans);

int mv88e6xxx_port_fdb_del(struct dsa_switch *ds, int port,

			   const unsigned char *addr, u16 vid);

			   const struct switchdev_obj_port_fdb *fdb);

int mv88e6xxx_port_fdb_getnext(struct dsa_switch *ds, int port,

			       unsigned char *addr, u16 *vid, bool *is_static);

int mv88e6xxx_phy_page_read(struct dsa_switch *ds, int port, int page, int reg);

include/net/dsa.h

+1 −1
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ struct dsa_switch_driver { 
				const struct switchdev_obj_port_fdb *fdb,

				struct switchdev_trans *trans);

	int	(*port_fdb_del)(struct dsa_switch *ds, int port,

				const unsigned char *addr, u16 vid);

				const struct switchdev_obj_port_fdb *fdb);

	int	(*port_fdb_getnext)(struct dsa_switch *ds, int port,

				    unsigned char *addr, u16 *vid,

				    bool *is_static);

net/dsa/slave.c

+1 −1
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ static int dsa_slave_port_fdb_del(struct net_device *dev, 
	int ret = -EOPNOTSUPP;



	if (ds->drv->port_fdb_del)

		ret = ds->drv->port_fdb_del(ds, p->port, fdb->addr, fdb->vid);

		ret = ds->drv->port_fdb_del(ds, p->port, fdb);



	return ret;

}