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

Commit 0d22a3cf authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mlxsw-next-fixes' 



Jiri Pirko says:

====================
mlxsw: spectrum_router: Couple of fixes

Ido Schimmel (2):
  mlxsw: spectrum_router: Trap packets hitting anycast routes
  mlxsw: spectrum_router: Set abort trap in all virtual routers
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 843bd2b3 241bc859

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

+1 −4
Original line number Diff line number Diff line
@@ -3659,7 +3659,7 @@ static void mlxsw_sp_fib6_entry_type_set(struct mlxsw_sp_fib_entry *fib_entry, 
	 * local, which will cause them to be trapped with a lower

	 * priority than packets that need to be locally received.

	 */

	if (rt->rt6i_flags & RTF_LOCAL)

	if (rt->rt6i_flags & (RTF_LOCAL | RTF_ANYCAST))

		fib_entry->type = MLXSW_SP_FIB_ENTRY_TYPE_TRAP;

	else if (rt->rt6i_flags & RTF_REJECT)

		fib_entry->type = MLXSW_SP_FIB_ENTRY_TYPE_LOCAL;
@@ -3993,9 +3993,6 @@ static int __mlxsw_sp_router_set_abort_trap(struct mlxsw_sp *mlxsw_sp, 
		char raltb_pl[MLXSW_REG_RALTB_LEN];

		char ralue_pl[MLXSW_REG_RALUE_LEN];



		if (!mlxsw_sp_vr_is_used(vr))

			continue;



		mlxsw_reg_raltb_pack(raltb_pl, vr->id, proto, tree_id);

		err = mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(raltb),

				      raltb_pl);