From: David Ahern <dsahern@kernel.org>
To: Dmitry Safonov <dima@arista.com>, linux-kernel@vger.kernel.org
Cc: Dmitry Safonov <0x7f454c46@gmail.com>,
Mobashshera Rasool <mobash.rasool.linux@gmail.com>,
"David S. Miller" <davem@davemloft.net>,
Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>,
Jakub Kicinski <kuba@kernel.org>,
netdev@vger.kernel.org
Subject: Re: [PATCH net-next] net/ip6mr: Fix build with !CONFIG_IPV6_PIMSM_V2
Date: Thu, 24 Feb 2022 20:00:43 -0700 [thread overview]
Message-ID: <ed3e1f08-045c-1a9e-9319-5789faddc473@kernel.org> (raw)
In-Reply-To: <20220223121721.421247-1-dima@arista.com>
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
next prev parent reply other threads:[~2022-02-25 3:00 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-23 12:17 Dmitry Safonov
2022-02-25 3:00 ` David Ahern [this message]
2022-02-25 14:54 ` Dmitry Safonov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ed3e1f08-045c-1a9e-9319-5789faddc473@kernel.org \
--to=dsahern@kernel.org \
--cc=0x7f454c46@gmail.com \
--cc=davem@davemloft.net \
--cc=dima@arista.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mobash.rasool.linux@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=yoshfuji@linux-ipv6.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®