diff options
| author |  Ido Schimmel <idosch@mellanox.com>
| 2016-11-16 09:51:58 +0100 |
|---|---|---|
| committer |  David S. Miller <davem@davemloft.net>
| 2016-11-16 15:18:01 -0500 |
| commit | d331d30360d7d10c4150a5a6452bc8d9aeb5784f (patch) | |
| tree | 9c6a1cfa03cd37ca9d261ee53d81872af59c6aab /drivers | |
| parent | net: dsa: mv88e6xxx: Respect SPEED_UNFORCED, don't set force bit (diff) | |
| download | linux-d331d30360d7d10c4150a5a6452bc8d9aeb5784f.tar.gz linux-d331d30360d7d10c4150a5a6452bc8d9aeb5784f.tar.bz2 linux-d331d30360d7d10c4150a5a6452bc8d9aeb5784f.zip | |
mlxsw: spectrum_router: Adjust placement of FIB abort warning
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c index 164bd309e92b..683f0454170c 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c @@ -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); |