lkml.org 
[lkml]   [2022]   [Feb]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [PATCH net-next] net/ip6mr: Fix build with !CONFIG_IPV6_PIMSM_V2
From
On 2/23/22 5:17 AM, Dmitry Safonov wrote:
> diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c
> index a9775c830194..4e74bc61a3db 100644
> --- a/net/ipv6/ip6mr.c
> +++ b/net/ipv6/ip6mr.c
> @@ -1653,7 +1653,6 @@ int ip6_mroute_setsockopt(struct sock *sk, int optname, sockptr_t optval,
> mifi_t mifi;
> struct net *net = sock_net(sk);
> struct mr_table *mrt;
> - bool do_wrmifwhole;
>
> if (sk->sk_type != SOCK_RAW ||
> inet_sk(sk)->inet_num != IPPROTO_ICMPV6)
> @@ -1761,6 +1760,7 @@ int ip6_mroute_setsockopt(struct sock *sk, int optname, sockptr_t optval,
> #ifdef CONFIG_IPV6_PIMSM_V2
> case MRT6_PIM:
> {
> + bool do_wrmifwhole;
> int v;
>
> if (optlen != sizeof(v))
>
> base-commit: 922ea87ff6f2b63f413c6afa2c25b287dce76639

you could do one better and move it under the
'if (v != mrt->mroute_do_pim) {'

so that the do_wrmifwhole check is only done when needed

\
 
 \ /
  Last update: 2022-02-25 04:01    [W:0.189 / U:0.288 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site