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

Commit d331d303 authored by Ido Schimmel's avatar Ido Schimmel Committed by David S. Miller
Browse files

mlxsw: spectrum_router: Adjust placement of FIB abort warning 

The recent merge commit bb598c1b ("Merge
git://git.kernel.org/pub/scm/linux/kernel/git/davem/net"

) would cause
the FIB abort warning to fire whenever we flush the FIB tables - either
during module removal or actual abort.

Move it back to its rightful location in the FIB abort function.

Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0b6e3d03

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

+3 −3
Original line number Diff line number Diff line
@@ -1872,9 +1872,6 @@ static void mlxsw_sp_router_fib_flush(struct mlxsw_sp *mlxsw_sp) 
	struct mlxsw_sp_vr *vr;

	int i;



	if (mlxsw_sp->router.aborted)

		return;

	dev_warn(mlxsw_sp->bus_info->dev, "FIB abort triggered. Note that FIB entries are no longer being offloaded to this device.\n");

	for (i = 0; i < MLXSW_CORE_RES_GET(mlxsw_sp->core, MAX_VRS); i++) {

		vr = &mlxsw_sp->router.vrs[i];
@@ -1899,6 +1896,9 @@ static void mlxsw_sp_router_fib4_abort(struct mlxsw_sp *mlxsw_sp) 
{

	int err;



	if (mlxsw_sp->router.aborted)

		return;

	dev_warn(mlxsw_sp->bus_info->dev, "FIB abort triggered. Note that FIB entries are no longer being offloaded to this device.\n");

	mlxsw_sp_router_fib_flush(mlxsw_sp);

	mlxsw_sp->router.aborted = true;

	err = mlxsw_sp_router_set_abort_trap(mlxsw_sp);