2022-02-25 17:43:22

by Dmitry Safonov

Subject: [PATCH net-next v2] net/ip6mr: Fix build with !CONFIG_IPV6_PIMSM_V2

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 <[email protected]>
Cc: David S. Miller <[email protected]>
Cc: Hideaki YOSHIFUJI <[email protected]>
Cc: David Ahern <[email protected]>
Cc: Jakub Kicinski <[email protected]>
Cc: [email protected]
Fixes: 4b340a5a726d
Signed-off-by: Dmitry Safonov <[email protected]>
---
v2: move the (v == MRT6MSG_WRMIFWHOLE) check under if (v != mrt->mroute_do_pim)

net/ipv6/ip6mr.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c
index a9775c830194..9292f067c829 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_pim;
int v;

if (optlen != sizeof(v))
@@ -1768,14 +1768,14 @@ int ip6_mroute_setsockopt(struct sock *sk, int optname, sockptr_t optval,
if (copy_from_sockptr(&v, optval, sizeof(v)))
return -EFAULT;

- do_wrmifwhole = (v == MRT6MSG_WRMIFWHOLE);
- v = !!v;
+ do_pim = !!v;
+
rtnl_lock();
ret = 0;
- if (v != mrt->mroute_do_pim) {
- mrt->mroute_do_pim = v;
- mrt->mroute_do_assert = v;
- mrt->mroute_do_wrvifwhole = do_wrmifwhole;
+ if (do_pim != mrt->mroute_do_pim) {
+ mrt->mroute_do_pim = do_pim;
+ mrt->mroute_do_assert = do_pim;
+ mrt->mroute_do_wrvifwhole = (v == MRT6MSG_WRMIFWHOLE);
}
rtnl_unlock();
return ret;
--
2.35.1

2022-02-27 21:00:17

by Cong Wang

Subject: Re: [PATCH net-next v2] net/ip6mr: Fix build with !CONFIG_IPV6_PIMSM_V2

On Fri, Feb 25, 2022 at 02:52:06PM +0000, Dmitry Safonov wrote:
> 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 <[email protected]>
> Cc: David S. Miller <[email protected]>
> Cc: Hideaki YOSHIFUJI <[email protected]>
> Cc: David Ahern <[email protected]>
> Cc: Jakub Kicinski <[email protected]>
> Cc: [email protected]
> Fixes: 4b340a5a726d

Documentation/process/submitting-patches.rst:

If your patch fixes a bug in a specific commit, e.g. you found an issue using
``git bisect``, please use the 'Fixes:' tag with the first 12 characters of
the SHA-1 ID, and the one line summary. Do not split the tag across multiple
lines, tags are exempt from the "wrap at 75 columns" rule in order to simplify
parsing scripts. For example::

Fixes: 54a4f0239f2e ("KVM: MMU: make kvm_mmu_zap_page() return the number of pages it actually freed")

The following ``git config`` settings can be used to add a pretty format for
outputting the above style in the ``git log`` or ``git show`` commands::

[core]
abbrev = 12
[pretty]
fixes = Fixes: %h (\"%s\")