net: ipv6mr: fix unused variable warning with CONFIG_IPV6_PIMSM_V2=n
Subsystems (3)
PATCH 1/1 net: ipv6mr: fix unused variable warning with CONFIG_IPV6_PIMSM_V2=n
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 <[email protected]>
--- net/ipv6/ip6mr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv6/ip6mr.c +1 -1
@@ -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))
Signature · 1 line
2.35.1
This patch was applied to netdev/net.git (master) by David S. Miller <[email protected]>:
Hello:
This patch was applied to netdev/net.git (master)
by David S. Miller <[email protected]>:
Quoted 8 lines · 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_V2scope where its used.Fixes 4b340a5a726d ("net: ip6mr: add support for passing full packet on wrong mif")Signed-off-by Florian Westphal <[email protected]>[...]
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!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html