| Message ID | 20180311074549.14112-2-idosch@mellanox.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | mlxsw: Removing dependency of mlxsw on GRE | expand |
On 3/11/18 12:45 AM, Ido Schimmel wrote: > From: Petr Machata <petrm@mellanox.com> > > In order to abstract away access to the > ipv6.sysctl.multipath_hash_policy variable, which is not available on > systems compiled without IPv6 support, introduce a wrapper function > ip6_multipath_hash_policy() that falls back to 0 on non-IPv6 systems. > > Use this wrapper from mlxsw/spectrum_router instead of a direct > reference. > > Signed-off-by: Petr Machata <petrm@mellanox.com> > Signed-off-by: Ido Schimmel <idosch@mellanox.com> > --- > drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c | 2 +- > include/net/ipv6.h | 11 +++++++++++ > 2 files changed, 12 insertions(+), 1 deletion(-) > Acked-by: David Ahern <dsahern@gmail.com> For consistency, would be good to use that inline everywhere the sysctl is referenced.
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c index a8a578610a7b..921bd1075edf 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c @@ -7031,7 +7031,7 @@ static void mlxsw_sp_mp4_hash_init(char *recr2_pl) static void mlxsw_sp_mp6_hash_init(char *recr2_pl) { - bool only_l3 = !init_net.ipv6.sysctl.multipath_hash_policy; + bool only_l3 = !ip6_multipath_hash_policy(&init_net); mlxsw_sp_mp_hash_header_set(recr2_pl, MLXSW_REG_RECR2_IPV6_EN_NOT_TCP_NOT_UDP); diff --git a/include/net/ipv6.h b/include/net/ipv6.h index cabd3cdd4015..50a6f0ddb878 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h @@ -888,6 +888,17 @@ static inline int ip6_default_np_autolabel(struct net *net) } #endif +#if IS_ENABLED(CONFIG_IPV6) +static inline int ip6_multipath_hash_policy(const struct net *net) +{ + return net->ipv6.sysctl.multipath_hash_policy; +} +#else +static inline int ip6_multipath_hash_policy(const struct net *net) +{ + return 0; +} +#endif /* * Header manipulation