From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423382AbcFNByT (ORCPT ); Mon, 13 Jun 2016 21:54:19 -0400 Received: from rslrsmtp2.opaltelecom.net ([62.24.128.202]:46231 "EHLO iprslrsmtp2msp.cpwnetworks.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1161377AbcFNByQ (ORCPT ); Mon, 13 Jun 2016 21:54:16 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2CeBAAeYV9X//6AGD5cHQGEc7kjhAiGFwKBfwEBAQEBAWYnhEwCBCdSEEARVwYBEog0ulkBAQEHAgEklQ8FmGKOKmSIX4Vcj28CVINvbYoIAQEB X-IPAS-Result: A2CeBAAeYV9X//6AGD5cHQGEc7kjhAiGFwKBfwEBAQEBAWYnhEwCBCdSEEARVwYBEog0ulkBAQEHAgEklQ8FmGKOKmSIX4Vcj28CVINvbYoIAQEB X-IronPort-AV: E=Sophos;i="5.26,469,1459810800"; d="scan'208";a="738753145" From: Quentin Armitage To: Wensong Zhang , Simon Horman , Julian Anastasov , Pablo Neira Ayuso , Patrick McHardy , Jozsef Kadlecsik , "David S. Miller" , netdev@vger.kernel.org, lvs-devel@vger.kernel.org, netfilter-devel@vger.kernel.org, coreteam@netfilter.org, linux-kernel@vger.kernel.org Cc: Quentin Armitage Subject: [PATCH 3/5] ipvs: Don't check result < 0 after setting result = 0 Date: Tue, 14 Jun 2016 02:43:31 +0100 Message-Id: <1465868613-26146-4-git-send-email-quentin@armitage.org.uk> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1465868613-26146-1-git-send-email-quentin@armitage.org.uk> References: <1465868613-26146-1-git-send-email-quentin@armitage.org.uk> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Move the block testing result < 0 to avoid the test immediately after setting result = 0 Signed-off-by: Quentin Armitage --- net/netfilter/ipvs/ip_vs_sync.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c index 3181fd0..29d73d8 100644 --- a/net/netfilter/ipvs/ip_vs_sync.c +++ b/net/netfilter/ipvs/ip_vs_sync.c @@ -1497,13 +1497,13 @@ static struct socket *make_send_sock(struct netns_ipvs *ipvs, int id, struct net ipvs->mcast_ifn, &addr); result = bind_mcastif_addr(sock, dev); + if (result < 0) { + pr_err("Error binding address of the mcast interface\n"); + goto error; + } } else result = 0; - if (result < 0) { - pr_err("Error binding address of the mcast interface\n"); - goto error; - } get_mcast_sockaddr(&mcast_addr, &salen, &ipvs->mcfg, id); result = sock->ops->connect(sock, (struct sockaddr *) &mcast_addr, -- 1.7.7.6