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

Commit 1f36faf2 authored by Vivien Didelot's avatar Vivien Didelot Committed by David S. Miller
Browse files

net: dsa: push prepare phase in port_fdb_add 



Now that the prepare phase is pushed down to the DSA drivers, propagate
it to the port_fdb_add function.

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 146a3206

drivers/net/dsa/mv88e6xxx.c

+5 −3
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/phy.h>

#include <linux/seq_file.h>

#include <net/dsa.h>

#include <net/switchdev.h>

#include "mv88e6xxx.h"



/* MDIO bus access can be nested in the case of PHYs connected to the
@@ -1852,16 +1853,17 @@ int mv88e6xxx_port_fdb_prepare(struct dsa_switch *ds, int port, 
}



int mv88e6xxx_port_fdb_add(struct dsa_switch *ds, int port,

			   const unsigned char *addr, u16 vid)

			   const struct switchdev_obj_port_fdb *fdb,

			   struct switchdev_trans *trans)

{

	int state = is_multicast_ether_addr(addr) ?

	int state = is_multicast_ether_addr(fdb->addr) ?

		GLOBAL_ATU_DATA_STATE_MC_STATIC :

		GLOBAL_ATU_DATA_STATE_UC_STATIC;

	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, state);

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

	mutex_unlock(&ps->smi_mutex);



	return ret;

drivers/net/dsa/mv88e6xxx.h

+2 −1
Original line number Diff line number Diff line
@@ -478,7 +478,8 @@ int mv88e6xxx_port_fdb_prepare(struct dsa_switch *ds, int port, 
			       const struct switchdev_obj_port_fdb *fdb,

			       struct switchdev_trans *trans);

int mv88e6xxx_port_fdb_add(struct dsa_switch *ds, int port,

			   const unsigned char *addr, u16 vid);

			   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);

int mv88e6xxx_port_fdb_getnext(struct dsa_switch *ds, int port,

include/net/dsa.h

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

				    struct switchdev_trans *trans);

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

				const unsigned char *addr, u16 vid);

				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);

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

net/dsa/slave.c

+1 −1
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ static int dsa_slave_port_fdb_add(struct net_device *dev, 
	if (switchdev_trans_ph_prepare(trans))

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

	else

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

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



	return ret;

}