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

Commit d17d9f5e authored by Petr Machata's avatar Petr Machata Committed by David S. Miller
Browse files

switchdev: Replace port obj add/del SDO with a notification 



Drop switchdev_ops.switchdev_port_obj_add and _del. Drop the uses of
this field from all clients, which were migrated to use switchdev
notification in the previous patches.

Add a new function switchdev_port_obj_notify() that sends the switchdev
notifications SWITCHDEV_PORT_OBJ_ADD and _DEL.

Update switchdev_port_obj_del_now() to dispatch to this new function.
Drop __switchdev_port_obj_add() and update switchdev_port_obj_add()
likewise.

Signed-off-by: default avatarPetr Machata <petrm@mellanox.com>
Reviewed-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0e332c85

drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c

+0 −2
Original line number Diff line number Diff line
@@ -1968,8 +1968,6 @@ static struct mlxsw_sp_port *mlxsw_sp_lag_rep_port(struct mlxsw_sp *mlxsw_sp, 
static const struct switchdev_ops mlxsw_sp_port_switchdev_ops = {

	.switchdev_port_attr_get	= mlxsw_sp_port_attr_get,

	.switchdev_port_attr_set	= mlxsw_sp_port_attr_set,

	.switchdev_port_obj_add		= mlxsw_sp_port_obj_add,

	.switchdev_port_obj_del		= mlxsw_sp_port_obj_del,

};



static int

drivers/net/ethernet/mscc/ocelot.c

+0 −2
Original line number Diff line number Diff line
@@ -1337,8 +1337,6 @@ static int ocelot_port_obj_del(struct net_device *dev, 
static const struct switchdev_ops ocelot_port_switchdev_ops = {

	.switchdev_port_attr_get	= ocelot_port_attr_get,

	.switchdev_port_attr_set	= ocelot_port_attr_set,

	.switchdev_port_obj_add		= ocelot_port_obj_add,

	.switchdev_port_obj_del		= ocelot_port_obj_del,

};



static int ocelot_port_bridge_join(struct ocelot_port *ocelot_port,

drivers/net/ethernet/rocker/rocker_main.c

+0 −2
Original line number Diff line number Diff line
@@ -2145,8 +2145,6 @@ static int rocker_port_obj_del(struct net_device *dev, 
static const struct switchdev_ops rocker_port_switchdev_ops = {

	.switchdev_port_attr_get	= rocker_port_attr_get,

	.switchdev_port_attr_set	= rocker_port_attr_set,

	.switchdev_port_obj_add		= rocker_port_obj_add,

	.switchdev_port_obj_del		= rocker_port_obj_del,

};



struct rocker_fib_event_work {

drivers/staging/fsl-dpaa2/ethsw/ethsw.c

+0 −2
Original line number Diff line number Diff line
@@ -930,8 +930,6 @@ static int swdev_port_obj_del(struct net_device *netdev, 
static const struct switchdev_ops ethsw_port_switchdev_ops = {

	.switchdev_port_attr_get	= swdev_port_attr_get,

	.switchdev_port_attr_set	= swdev_port_attr_set,

	.switchdev_port_obj_add		= swdev_port_obj_add,

	.switchdev_port_obj_del		= swdev_port_obj_del,

};



/* For the moment, only flood setting needs to be updated */

include/net/switchdev.h

+0 −9
Original line number Diff line number Diff line
@@ -121,10 +121,6 @@ typedef int switchdev_obj_dump_cb_t(struct switchdev_obj *obj); 
 * @switchdev_port_attr_get: Get a port attribute (see switchdev_attr).

 *

 * @switchdev_port_attr_set: Set a port attribute (see switchdev_attr).

 *

 * @switchdev_port_obj_add: Add an object to port (see switchdev_obj_*).

 *

 * @switchdev_port_obj_del: Delete an object from port (see switchdev_obj_*).

 */

struct switchdev_ops {

	int	(*switchdev_port_attr_get)(struct net_device *dev,
@@ -132,11 +128,6 @@ struct switchdev_ops { 
	int	(*switchdev_port_attr_set)(struct net_device *dev,

					   const struct switchdev_attr *attr,

					   struct switchdev_trans *trans);

	int	(*switchdev_port_obj_add)(struct net_device *dev,

					  const struct switchdev_obj *obj,

					  struct switchdev_trans *trans);

	int	(*switchdev_port_obj_del)(struct net_device *dev,

					  const struct switchdev_obj *obj);

};



enum switchdev_notifier_type {