Commit a3ebe92a authored by Florian Westphal's avatar Florian Westphal Committed by David S. Miller
Browse files

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: 4b340a5a ("net: ip6mr: add support for passing full packet on wrong mif")
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 74edbe9e

net/ipv6/ip6mr.c

+1 −1
Original line number Diff line number Diff line
@@ -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))