Commit f6050ee6 authored by Petr Machata's avatar Petr Machata Committed by David S. Miller
Browse files

mlxsw: spectrum_router: Extract mlxsw_sp_rt6_is_gateway() 



IPv6 counterpart of the previous patch: introduce a function to
determine whether a given route is a gateway route.

The new function takes a mlxsw_sp argument which follow-up patches will
use. Thus mlxsw_sp_fib6_entry_type_set() got that argument as well.

Signed-off-by: default avatarPetr Machata <petrm@mellanox.com>
Reviewed-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 9b01451a

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

+11 −4
Original line number Diff line number Diff line
@@ -3526,6 +3526,12 @@ static void mlxsw_sp_nexthop6_fini(struct mlxsw_sp *mlxsw_sp, 
	mlxsw_sp_nexthop_rif_fini(nh);

}



static bool mlxsw_sp_rt6_is_gateway(const struct mlxsw_sp *mlxsw_sp,

				    const struct rt6_info *rt)

{

	return rt->rt6i_flags & RTF_GATEWAY;

}



static struct mlxsw_sp_nexthop_group *

mlxsw_sp_nexthop6_group_create(struct mlxsw_sp *mlxsw_sp,

			       struct mlxsw_sp_fib6_entry *fib6_entry)
@@ -3548,7 +3554,7 @@ mlxsw_sp_nexthop6_group_create(struct mlxsw_sp *mlxsw_sp, 
#endif

	mlxsw_sp_rt6 = list_first_entry(&fib6_entry->rt6_list,

					struct mlxsw_sp_rt6, list);

	nh_grp->gateway = !!(mlxsw_sp_rt6->rt->rt6i_flags & RTF_GATEWAY);

	nh_grp->gateway = mlxsw_sp_rt6_is_gateway(mlxsw_sp, mlxsw_sp_rt6->rt);

	nh_grp->count = fib6_entry->nrt6;

	for (i = 0; i < nh_grp->count; i++) {

		struct rt6_info *rt = mlxsw_sp_rt6->rt;
@@ -3705,7 +3711,8 @@ mlxsw_sp_fib6_entry_nexthop_del(struct mlxsw_sp *mlxsw_sp, 
	mlxsw_sp_rt6_destroy(mlxsw_sp_rt6);

}



static void mlxsw_sp_fib6_entry_type_set(struct mlxsw_sp_fib_entry *fib_entry,

static void mlxsw_sp_fib6_entry_type_set(struct mlxsw_sp *mlxsw_sp,

					 struct mlxsw_sp_fib_entry *fib_entry,

					 const struct rt6_info *rt)

{

	/* Packets hitting RTF_REJECT routes need to be discarded by the
@@ -3718,7 +3725,7 @@ static void mlxsw_sp_fib6_entry_type_set(struct mlxsw_sp_fib_entry *fib_entry, 
		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;

	else if (rt->rt6i_flags & RTF_GATEWAY)

	else if (mlxsw_sp_rt6_is_gateway(mlxsw_sp, rt))

		fib_entry->type = MLXSW_SP_FIB_ENTRY_TYPE_REMOTE;

	else

		fib_entry->type = MLXSW_SP_FIB_ENTRY_TYPE_LOCAL;
@@ -3758,7 +3765,7 @@ mlxsw_sp_fib6_entry_create(struct mlxsw_sp *mlxsw_sp, 
		goto err_rt6_create;

	}



	mlxsw_sp_fib6_entry_type_set(fib_entry, mlxsw_sp_rt6->rt);

	mlxsw_sp_fib6_entry_type_set(mlxsw_sp, fib_entry, mlxsw_sp_rt6->rt);



	INIT_LIST_HEAD(&fib6_entry->rt6_list);

	list_add_tail(&mlxsw_sp_rt6->list, &fib6_entry->rt6_list);

CRA Git | Maintained and supported by SUSTech CRA and CCSE