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

net: switchdev: Add extack to switchdev_handle_port_obj_add() callback 



Drivers use switchdev_handle_port_obj_add() to handle recursive descent
through lower devices. Change this function prototype to take add_cb
that itself takes an extack argument. Decode extack from
switchdev_notifier_port_obj_info and pass it to add_cb.

Update mlxsw and ocelot drivers which use this helper.

Signed-off-by: default avatarPetr Machata <petrm@mellanox.com>
Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Acked-by: default avatarIvan Vecera <ivecera@redhat.com>
Reviewed-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 479c86dc

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

+2 −1
Original line number Diff line number Diff line
@@ -1777,7 +1777,8 @@ static void mlxsw_sp_span_respin_schedule(struct mlxsw_sp *mlxsw_sp) 


static int mlxsw_sp_port_obj_add(struct net_device *dev,

				 const struct switchdev_obj *obj,

				 struct switchdev_trans *trans)

				 struct switchdev_trans *trans,

				 struct netlink_ext_ack *extack)

{

	struct mlxsw_sp_port *mlxsw_sp_port = netdev_priv(dev);

	const struct switchdev_obj_port_vlan *vlan;

drivers/net/ethernet/mscc/ocelot.c

+2 −1
Original line number Diff line number Diff line
@@ -1293,7 +1293,8 @@ static int ocelot_port_obj_del_mdb(struct net_device *dev, 


static int ocelot_port_obj_add(struct net_device *dev,

			       const struct switchdev_obj *obj,

			       struct switchdev_trans *trans)

			       struct switchdev_trans *trans,

			       struct netlink_ext_ack *extack)

{

	int ret = 0;

include/net/switchdev.h

+4 −2
Original line number Diff line number Diff line
@@ -215,7 +215,8 @@ int switchdev_handle_port_obj_add(struct net_device *dev, 
			bool (*check_cb)(const struct net_device *dev),

			int (*add_cb)(struct net_device *dev,

				      const struct switchdev_obj *obj,

				      struct switchdev_trans *trans));

				      struct switchdev_trans *trans,

				      struct netlink_ext_ack *extack));

int switchdev_handle_port_obj_del(struct net_device *dev,

			struct switchdev_notifier_port_obj_info *port_obj_info,

			bool (*check_cb)(const struct net_device *dev),
@@ -304,7 +305,8 @@ switchdev_handle_port_obj_add(struct net_device *dev, 
			bool (*check_cb)(const struct net_device *dev),

			int (*add_cb)(struct net_device *dev,

				      const struct switchdev_obj *obj,

				      struct switchdev_trans *trans))

				      struct switchdev_trans *trans,

				      struct netlink_ext_ack *extack))

{

	return 0;

}

net/switchdev/switchdev.c

+9 −3
Original line number Diff line number Diff line
@@ -616,16 +616,21 @@ static int __switchdev_handle_port_obj_add(struct net_device *dev, 
			bool (*check_cb)(const struct net_device *dev),

			int (*add_cb)(struct net_device *dev,

				      const struct switchdev_obj *obj,

				      struct switchdev_trans *trans))

				      struct switchdev_trans *trans,

				      struct netlink_ext_ack *extack))

{

	struct netlink_ext_ack *extack;

	struct net_device *lower_dev;

	struct list_head *iter;

	int err = -EOPNOTSUPP;



	extack = switchdev_notifier_info_to_extack(&port_obj_info->info);



	if (check_cb(dev)) {

		/* This flag is only checked if the return value is success. */

		port_obj_info->handled = true;

		return add_cb(dev, port_obj_info->obj, port_obj_info->trans);

		return add_cb(dev, port_obj_info->obj, port_obj_info->trans,

			      extack);

	}



	/* Switch ports might be stacked under e.g. a LAG. Ignore the
@@ -650,7 +655,8 @@ int switchdev_handle_port_obj_add(struct net_device *dev, 
			bool (*check_cb)(const struct net_device *dev),

			int (*add_cb)(struct net_device *dev,

				      const struct switchdev_obj *obj,

				      struct switchdev_trans *trans))

				      struct switchdev_trans *trans,

				      struct netlink_ext_ack *extack))

{

	int err;

CRA Git | Maintained and supported by SUSTech CRA and CCSE