| Message ID | 20220223121721.421247-1-dima@arista.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] net/ip6mr: Fix build with !CONFIG_IPV6_PIMSM_V2 | expand |
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
On 2/25/22 03:00, David Ahern wrote: > 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 I've tried to keep it simple and just to fix the build as I don't know which tests to run. Anyway, I sent v2: https://lore.kernel.org/all/20220225145206.561409-1-dima@arista.com/T/#u Is it what you meant? Thanks, Dmitry
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))
The following build-error on my config: net/ipv6/ip6mr.c: In function ‘ip6_mroute_setsockopt’: net/ipv6/ip6mr.c:1656:14: error: unused variable ‘do_wrmifwhole’ [-Werror=unused-variable] 1656 | bool do_wrmifwhole; | ^ Cc: Mobashshera Rasool <mobash.rasool.linux@gmail.com> Cc: David S. Miller <davem@davemloft.net> Cc: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org> Cc: David Ahern <dsahern@kernel.org> Cc: Jakub Kicinski <kuba@kernel.org> Cc: netdev@vger.kernel.org Fixes: 4b340a5a726d Signed-off-by: Dmitry Safonov <dima@arista.com> --- net/ipv6/ip6mr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: 922ea87ff6f2b63f413c6afa2c25b287dce76639