From: Borislav Petkov Subject: [PATCH] netfilter/ipvs: Fix unused variable warning Date: Sat, 16 Feb 2019 23:33:58 +0100 Message-ID: <20190216223358.30711-1-bp@alien8.de> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Cc: Andrea Claudi , coreteam@netfilter.org, Florian Westphal , Jozsef Kadlecsik , Julian Anastasov , Li Shuang , netfilter-devel@vger.kernel.org, Pablo Neira Ayuso , Simon Horman To: LKML Return-path: Sender: linux-kernel-owner@vger.kernel.org List-Id: netfilter-devel.vger.kernel.org From: Borislav Petkov Move the local variable 'ret' into the IP_VS_IPV6 ifdef so that the unused variable warning doesn't fire for randconfig builds with CONFIG_IP_VS_IPV6 disabled. Fixes: 098e13f5b21d ("ipvs: fix dependency on nf_defrag_ipv6") Cc: Andrea Claudi Cc: coreteam@netfilter.org Cc: Florian Westphal Cc: Jozsef Kadlecsik Cc: Julian Anastasov Cc: Li Shuang Cc: netfilter-devel@vger.kernel.org Cc: Pablo Neira Ayuso Cc: Simon Horman Signed-off-by: Borislav Petkov --- net/netfilter/ipvs/ip_vs_ctl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c index 86afacb07e5f..ac8d848d7624 100644 --- a/net/netfilter/ipvs/ip_vs_ctl.c +++ b/net/netfilter/ipvs/ip_vs_ctl.c @@ -896,12 +896,13 @@ ip_vs_new_dest(struct ip_vs_service *svc, struct ip_vs_dest_user_kern *udest, { struct ip_vs_dest *dest; unsigned int atype, i; - int ret = 0; EnterFunction(2); #ifdef CONFIG_IP_VS_IPV6 if (udest->af == AF_INET6) { + int ret; + atype = ipv6_addr_type(&udest->addr.in6); if ((!(atype & IPV6_ADDR_UNICAST) || atype & IPV6_ADDR_LINKLOCAL) && -- 2.19.1