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

Commit 37956d78 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

mlxsw: spectrum_router: Make mlxsw_sp_router_fib4_del return void and remove warn 



The function return value is not checked anywhere. Also, the warning
causes huge slowdown when removing large number of FIB entries which
were not offloaded, because of ordering issue. Ido's preparing
a patchset to fix the ordering issue, but that is definitelly not
net tree material.

Fixes: b45f64d1 ("mlxsw: spectrum_router: Use FIB notifications instead of switchdev calls")
Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 19271c1a

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

+5 −8
Original line number Diff line number Diff line
@@ -1820,19 +1820,17 @@ static int mlxsw_sp_router_fib4_add(struct mlxsw_sp *mlxsw_sp, 
	return err;

}



static int mlxsw_sp_router_fib4_del(struct mlxsw_sp *mlxsw_sp,

static void mlxsw_sp_router_fib4_del(struct mlxsw_sp *mlxsw_sp,

				     struct fib_entry_notifier_info *fen_info)

{

	struct mlxsw_sp_fib_entry *fib_entry;



	if (mlxsw_sp->router.aborted)

		return 0;

		return;



	fib_entry = mlxsw_sp_fib_entry_find(mlxsw_sp, fen_info);

	if (!fib_entry) {

		dev_warn(mlxsw_sp->bus_info->dev, "Failed to find FIB4 entry being removed.\n");

		return -ENOENT;

	}

	if (!fib_entry)

		return;



	if (fib_entry->ref_count == 1) {

		mlxsw_sp_fib_entry_del(mlxsw_sp, fib_entry);
@@ -1840,7 +1838,6 @@ static int mlxsw_sp_router_fib4_del(struct mlxsw_sp *mlxsw_sp, 
	}



	mlxsw_sp_fib_entry_put(mlxsw_sp, fib_entry);

	return 0;

}



static int mlxsw_sp_router_set_abort_trap(struct mlxsw_sp *mlxsw_sp)