| Message ID | 20220406100445.23847-1-fw@strlen.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | a3ebe92a0f2dfaeac257b685531decf8c9cd8eee |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] net: ipv6mr: fix unused variable warning with CONFIG_IPV6_PIMSM_V2=n | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Clearly marked for net |
| netdev/apply | success | Patch already applied to net |
Hello: This patch was applied to netdev/net.git (master) by David S. Miller <davem@davemloft.net>: On Wed, 6 Apr 2022 12:04:45 +0200 you wrote: > net/ipv6/ip6mr.c:1656:14: warning: unused variable 'do_wrmifwhole' > > Move it to the CONFIG_IPV6_PIMSM_V2 scope where its used. > > Fixes: 4b340a5a726d ("net: ip6mr: add support for passing full packet on wrong mif") > Signed-off-by: Florian Westphal <fw@strlen.de> > > [...] Here is the summary with links: - [net] net: ipv6mr: fix unused variable warning with CONFIG_IPV6_PIMSM_V2=n https://git.kernel.org/netdev/net/c/a3ebe92a0f2d You are awesome, thank you!
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))
net/ipv6/ip6mr.c:1656:14: warning: unused variable 'do_wrmifwhole' Move it to the CONFIG_IPV6_PIMSM_V2 scope where its used. Fixes: 4b340a5a726d ("net: ip6mr: add support for passing full packet on wrong mif") Signed-off-by: Florian Westphal <fw@strlen.de> --- net/ipv6/ip6mr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)