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

Commit 1b672f5f authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mlxsw-fixes' 



Jiri Pirko says:

====================
mlxsw: couple of fixes

Couple of fixes from Ido and myself.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2c2c8e33 3247ff2b

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

+9 −9
Original line number Diff line number Diff line
@@ -2106,6 +2106,13 @@ static int mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, u8 local_port, 
	dev->netdev_ops = &mlxsw_sp_port_netdev_ops;

	dev->ethtool_ops = &mlxsw_sp_port_ethtool_ops;



	err = mlxsw_sp_port_swid_set(mlxsw_sp_port, 0);

	if (err) {

		dev_err(mlxsw_sp->bus_info->dev, "Port %d: Failed to set SWID\n",

			mlxsw_sp_port->local_port);

		goto err_port_swid_set;

	}



	err = mlxsw_sp_port_dev_addr_init(mlxsw_sp_port);

	if (err) {

		dev_err(mlxsw_sp->bus_info->dev, "Port %d: Unable to init port mac address\n",
@@ -2131,13 +2138,6 @@ static int mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, u8 local_port, 
		goto err_port_system_port_mapping_set;

	}



	err = mlxsw_sp_port_swid_set(mlxsw_sp_port, 0);

	if (err) {

		dev_err(mlxsw_sp->bus_info->dev, "Port %d: Failed to set SWID\n",

			mlxsw_sp_port->local_port);

		goto err_port_swid_set;

	}



	err = mlxsw_sp_port_speed_by_width_set(mlxsw_sp_port, width);

	if (err) {

		dev_err(mlxsw_sp->bus_info->dev, "Port %d: Failed to enable speeds\n",
@@ -2219,10 +2219,10 @@ static int mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, u8 local_port, 
err_port_admin_status_set:

err_port_mtu_set:

err_port_speed_by_width_set:

	mlxsw_sp_port_swid_set(mlxsw_sp_port, MLXSW_PORT_SWID_DISABLED_PORT);

err_port_swid_set:

err_port_system_port_mapping_set:

err_dev_addr_init:

	mlxsw_sp_port_swid_set(mlxsw_sp_port, MLXSW_PORT_SWID_DISABLED_PORT);

err_port_swid_set:

	free_percpu(mlxsw_sp_port->pcpu_stats);

err_alloc_stats:

	kfree(mlxsw_sp_port->untagged_vlans);

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

+8 −1
Original line number Diff line number Diff line
@@ -1517,7 +1517,14 @@ int mlxsw_sp_router_init(struct mlxsw_sp *mlxsw_sp) 
		return err;

	mlxsw_sp_lpm_init(mlxsw_sp);

	mlxsw_sp_vrs_init(mlxsw_sp);

	return mlxsw_sp_neigh_init(mlxsw_sp);

	err = mlxsw_sp_neigh_init(mlxsw_sp);

	if (err)

		goto err_neigh_init;

	return 0;



err_neigh_init:

	__mlxsw_sp_router_fini(mlxsw_sp);

	return err;

}



void mlxsw_sp_router_fini(struct mlxsw_sp *mlxsw_sp)