Commit cf6def51 authored by Vladimir Oltean's avatar Vladimir Oltean Committed by Jakub Kicinski
Browse files

net: switchdev: delete switchdev_port_obj_add_now 



After the removal of the transactional model inside
switchdev_port_obj_add_now, it has no added value and we can just call
switchdev_port_obj_notify directly, bypassing this function. Let's
delete it.

Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Reviewed-by: default avatarIdo Schimmel <idosch@nvidia.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Acked-by: default avatarJiri Pirko <jiri@nvidia.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent ffb68fc5

net/switchdev/switchdev.c

+5 −12
Original line number Diff line number Diff line
@@ -242,23 +242,15 @@ static int switchdev_port_obj_notify(enum switchdev_notifier_type nt, 
	return 0;

}



static int switchdev_port_obj_add_now(struct net_device *dev,

				      const struct switchdev_obj *obj,

				      struct netlink_ext_ack *extack)

{

	ASSERT_RTNL();



	return switchdev_port_obj_notify(SWITCHDEV_PORT_OBJ_ADD,

					 dev, obj, extack);

}



static void switchdev_port_obj_add_deferred(struct net_device *dev,

					    const void *data)

{

	const struct switchdev_obj *obj = data;

	int err;



	err = switchdev_port_obj_add_now(dev, obj, NULL);

	ASSERT_RTNL();

	err = switchdev_port_obj_notify(SWITCHDEV_PORT_OBJ_ADD,

					dev, obj, NULL);

	if (err && err != -EOPNOTSUPP)

		netdev_err(dev, "failed (err=%d) to add object (id=%d)\n",

			   err, obj->id);
@@ -290,7 +282,8 @@ int switchdev_port_obj_add(struct net_device *dev, 
	if (obj->flags & SWITCHDEV_F_DEFER)

		return switchdev_port_obj_add_defer(dev, obj);

	ASSERT_RTNL();

	return switchdev_port_obj_add_now(dev, obj, extack);

	return switchdev_port_obj_notify(SWITCHDEV_PORT_OBJ_ADD,

					 dev, obj, extack);

}

EXPORT_SYMBOL_GPL(switchdev_port_obj_add);