mlxsw: spectrum_router: Adjust placement of FIB abort warning
authorIdo Schimmel <idosch@mellanox.com>
Wed, 16 Nov 2016 08:51:58 +0000 (09:51 +0100)
committerDavid S. Miller <davem@davemloft.net>
Wed, 16 Nov 2016 20:18:01 +0000 (15:18 -0500)
The recent merge commit bb598c1b8c9b ("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: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c

index 164bd309e92b648cbbbabfab8551efde7ebad4f2..683f0454170c713df33227e8ccb2f023aa9487c1 100644 (file)
@@ -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);