diff options
| author | David S. Miller <davem@davemloft.net> | 2017-10-02 11:20:22 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-10-02 11:20:22 -0700 |
| commit | 1dd236fda0c500a21c54f2140dadc488cde9265b (patch) | |
| tree | c7b7cd3153ecfcdc4332e77e837ff2b4e1928513 | |
| parent | 6227efc1a20b24a21ce8e9122c0569696d644aff (diff) | |
| parent | 85f44a15b1920babc2d28c11f514f5b217a29968 (diff) | |
| download | linux-next-1dd236fda0c500a21c54f2140dadc488cde9265b.tar.gz | |
Merge branch 'mlxsw-Fixlets'
Jiri Pirko says:
====================
mlxsw: Fixlets
Couple of small nit fixes from Petr
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c index ef4b86b3aa9b..58bc04cbbef4 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c @@ -1680,7 +1680,7 @@ __mlxsw_sp_router_neighs_update_rauhtd(struct mlxsw_sp *mlxsw_sp, err = mlxsw_reg_query(mlxsw_sp->core, MLXSW_REG(rauhtd), rauhtd_pl); if (err) { - dev_err_ratelimited(mlxsw_sp->bus_info->dev, "Failed to dump neighbour talbe\n"); + dev_err_ratelimited(mlxsw_sp->bus_info->dev, "Failed to dump neighbour table\n"); break; } num_rec = mlxsw_reg_rauhtd_num_rec_get(rauhtd_pl); @@ -3251,7 +3251,7 @@ mlxsw_sp_fib_entry_offload_refresh(struct mlxsw_sp_fib_entry *fib_entry, return; if (mlxsw_sp_fib_entry_should_offload(fib_entry)) mlxsw_sp_fib_entry_offload_set(fib_entry); - else if (!mlxsw_sp_fib_entry_should_offload(fib_entry)) + else mlxsw_sp_fib_entry_offload_unset(fib_entry); return; default: |