Commit efc42879 authored by Amit Cohen's avatar Amit Cohen Committed by Jakub Kicinski
Browse files

net: Do not call fib6_info_hw_flags_set() when IPv6 is disabled 



With the next patch mlxsw and netdevsim will fail in compilation if
CONFIG_IPV6 is disabled.

Do not call fib6_info_hw_flags_set() when IPv6 is disabled.

Signed-off-by: default avatarAmit Cohen <amcohen@nvidia.com>
Signed-off-by: default avatarIdo Schimmel <idosch@nvidia.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent fbaca8f8

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

+16 −0
Original line number Diff line number Diff line
@@ -4988,6 +4988,7 @@ mlxsw_sp_fib4_entry_hw_flags_clear(struct mlxsw_sp *mlxsw_sp, 
	fib_alias_hw_flags_set(mlxsw_sp_net(mlxsw_sp), &fri);

}



#if IS_ENABLED(CONFIG_IPV6)

static void

mlxsw_sp_fib6_entry_hw_flags_set(struct mlxsw_sp *mlxsw_sp,

				 struct mlxsw_sp_fib_entry *fib_entry)
@@ -5007,7 +5008,15 @@ mlxsw_sp_fib6_entry_hw_flags_set(struct mlxsw_sp *mlxsw_sp, 
		fib6_info_hw_flags_set(mlxsw_sp_net(mlxsw_sp), mlxsw_sp_rt6->rt,

				       should_offload, !should_offload);

}

#else

static void

mlxsw_sp_fib6_entry_hw_flags_set(struct mlxsw_sp *mlxsw_sp,

				 struct mlxsw_sp_fib_entry *fib_entry)

{

}

#endif



#if IS_ENABLED(CONFIG_IPV6)

static void

mlxsw_sp_fib6_entry_hw_flags_clear(struct mlxsw_sp *mlxsw_sp,

				   struct mlxsw_sp_fib_entry *fib_entry)
@@ -5021,6 +5030,13 @@ mlxsw_sp_fib6_entry_hw_flags_clear(struct mlxsw_sp *mlxsw_sp, 
		fib6_info_hw_flags_set(mlxsw_sp_net(mlxsw_sp), mlxsw_sp_rt6->rt,

				       false, false);

}

#else

static void

mlxsw_sp_fib6_entry_hw_flags_clear(struct mlxsw_sp *mlxsw_sp,

				   struct mlxsw_sp_fib_entry *fib_entry)

{

}

#endif



static void

mlxsw_sp_fib_entry_hw_flags_set(struct mlxsw_sp *mlxsw_sp,

drivers/net/netdevsim/fib.c

+8 −0
Original line number Diff line number Diff line
@@ -585,6 +585,7 @@ static int nsim_fib6_rt_append(struct nsim_fib_data *data, 
	return err;

}



#if IS_ENABLED(CONFIG_IPV6)

static void nsim_fib6_rt_hw_flags_set(struct nsim_fib_data *data,

				      const struct nsim_fib6_rt *fib6_rt,

				      bool trap)
@@ -595,6 +596,13 @@ static void nsim_fib6_rt_hw_flags_set(struct nsim_fib_data *data, 
	list_for_each_entry(fib6_rt_nh, &fib6_rt->nh_list, list)

		fib6_info_hw_flags_set(net, fib6_rt_nh->rt, false, trap);

}

#else

static void nsim_fib6_rt_hw_flags_set(struct nsim_fib_data *data,

				      const struct nsim_fib6_rt *fib6_rt,

				      bool trap)

{

}

#endif



static int nsim_fib6_rt_add(struct nsim_fib_data *data,

			    struct nsim_fib6_rt *fib6_rt)