mlxsw: switchx2: Move port used check outside port remove function (adc4e04a) · Commits · 戴 / test

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

+10 −4

Original line number	Diff line number	Diff line
		@@ -1093,20 +1093,25 @@ static void mlxsw_sx_port_remove(struct mlxsw_sx *mlxsw_sx, u8 local_port)
		{
		struct mlxsw_sx_port *mlxsw_sx_port = mlxsw_sx->ports[local_port];

		if (!mlxsw_sx_port)
		return;
		mlxsw_core_port_fini(&mlxsw_sx_port->core_port);
		unregister_netdev(mlxsw_sx_port->dev); /* This calls ndo_stop */
		mlxsw_sx->ports[local_port] = NULL;
		mlxsw_sx_port_swid_set(mlxsw_sx_port, MLXSW_PORT_SWID_DISABLED_PORT);
		free_percpu(mlxsw_sx_port->pcpu_stats);
		free_netdev(mlxsw_sx_port->dev);
		}

		static bool mlxsw_sx_port_created(struct mlxsw_sx *mlxsw_sx, u8 local_port)
		{
		return mlxsw_sx->ports[local_port] != NULL;
		}

		static void mlxsw_sx_ports_remove(struct mlxsw_sx *mlxsw_sx)
		{
		int i;

		for (i = 1; i < MLXSW_PORT_MAX_PORTS; i++)
		if (mlxsw_sx_port_created(mlxsw_sx, i))
		mlxsw_sx_port_remove(mlxsw_sx, i);
		kfree(mlxsw_sx->ports);
		}
		@@ -1138,6 +1143,7 @@ static int mlxsw_sx_ports_create(struct mlxsw_sx *mlxsw_sx)
		err_port_create:
		err_port_module_info_get:
		for (i--; i >= 1; i--)
		if (mlxsw_sx_port_created(mlxsw_sx, i))
		mlxsw_sx_port_remove(mlxsw_sx, i);
		kfree(mlxsw_sx->ports);
		return err;