Commit c8096578 authored by Jiri Pirko's avatar Jiri Pirko Committed by Jakub Kicinski
Browse files

net: devlink: remove netdev arg from devlink_port_type_eth_set() 



Since devlink_port_type_eth_set() should no longer be called by any
driver with netdev pointer as it should rather use
SET_NETDEV_DEVLINK_PORT, remove the netdev arg. Add a warn to
type_clear()

Signed-off-by: default avatarJiri Pirko <jiri@nvidia.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent ac73d4bf

drivers/net/ethernet/mellanox/mlx4/main.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -3043,7 +3043,7 @@ static int mlx4_init_port_info(struct mlx4_dev *dev, int port) 
	 */

	 */

	if (!IS_ENABLED(CONFIG_MLX4_EN) &&

	if (!IS_ENABLED(CONFIG_MLX4_EN) &&

	    dev->caps.port_type[port] == MLX4_PORT_TYPE_ETH)

	    dev->caps.port_type[port] == MLX4_PORT_TYPE_ETH)

		devlink_port_type_eth_set(&info->devlink_port, NULL);

		devlink_port_type_eth_set(&info->devlink_port);

	else if (!IS_ENABLED(CONFIG_MLX4_INFINIBAND) &&

	else if (!IS_ENABLED(CONFIG_MLX4_INFINIBAND) &&

		 dev->caps.port_type[port] == MLX4_PORT_TYPE_IB)

		 dev->caps.port_type[port] == MLX4_PORT_TYPE_IB)

		devlink_port_type_ib_set(&info->devlink_port, NULL);

		devlink_port_type_ib_set(&info->devlink_port, NULL);

include/net/devlink.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -1582,8 +1582,7 @@ int devlink_port_register(struct devlink *devlink, 
			  unsigned int port_index);

			  unsigned int port_index);

void devl_port_unregister(struct devlink_port *devlink_port);

void devl_port_unregister(struct devlink_port *devlink_port);

void devlink_port_unregister(struct devlink_port *devlink_port);

void devlink_port_unregister(struct devlink_port *devlink_port);

void devlink_port_type_eth_set(struct devlink_port *devlink_port,

void devlink_port_type_eth_set(struct devlink_port *devlink_port);

			       struct net_device *netdev);

void devlink_port_type_ib_set(struct devlink_port *devlink_port,

void devlink_port_type_ib_set(struct devlink_port *devlink_port,

			      struct ib_device *ibdev);

			      struct ib_device *ibdev);

void devlink_port_type_clear(struct devlink_port *devlink_port);

void devlink_port_type_clear(struct devlink_port *devlink_port);

net/core/devlink.c

+14 −9
Original line number Original line Diff line number Diff line
@@ -10097,17 +10097,15 @@ static void __devlink_port_type_set(struct devlink_port *devlink_port, 
 *	devlink_port_type_eth_set - Set port type to Ethernet

 *	devlink_port_type_eth_set - Set port type to Ethernet

 *

 *

 *	@devlink_port: devlink port

 *	@devlink_port: devlink port

 *	@netdev: related netdevice

 *

 *	If driver is calling this, most likely it is doing something wrong.

 */

 */

void devlink_port_type_eth_set(struct devlink_port *devlink_port,

void devlink_port_type_eth_set(struct devlink_port *devlink_port)

			       struct net_device *netdev)

{

{

	if (!netdev)

	dev_warn(devlink_port->devlink->dev,

	dev_warn(devlink_port->devlink->dev,

		 "devlink port type for port %d set to Ethernet without a software interface reference, device type not supported by the kernel?\n",

		 "devlink port type for port %d set to Ethernet without a software interface reference, device type not supported by the kernel?\n",

		 devlink_port->index);

		 devlink_port->index);



	__devlink_port_type_set(devlink_port, DEVLINK_PORT_TYPE_ETH, NULL,

	__devlink_port_type_set(devlink_port, DEVLINK_PORT_TYPE_ETH, netdev,

				false);

				false);

}

}

EXPORT_SYMBOL_GPL(devlink_port_type_eth_set);

EXPORT_SYMBOL_GPL(devlink_port_type_eth_set);
@@ -10130,9 +10128,16 @@ EXPORT_SYMBOL_GPL(devlink_port_type_ib_set); 
 *	devlink_port_type_clear - Clear port type

 *	devlink_port_type_clear - Clear port type

 *

 *

 *	@devlink_port: devlink port

 *	@devlink_port: devlink port

 *

 *	If driver is calling this for clearing Ethernet type, most likely

 *	it is doing something wrong.

 */

 */

void devlink_port_type_clear(struct devlink_port *devlink_port)

void devlink_port_type_clear(struct devlink_port *devlink_port)

{

{

	if (devlink_port->type == DEVLINK_PORT_TYPE_ETH)

		dev_warn(devlink_port->devlink->dev,

			 "devlink port type for port %d cleared without a software interface reference, device type not supported by the kernel?\n",

			 devlink_port->index);

	__devlink_port_type_set(devlink_port, DEVLINK_PORT_TYPE_NOTSET, NULL,

	__devlink_port_type_set(devlink_port, DEVLINK_PORT_TYPE_NOTSET, NULL,

				false);

				false);

}

}