From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933129AbcFOVnZ (ORCPT ); Wed, 15 Jun 2016 17:43:25 -0400 Received: from host-92-27-6-192.static.as13285.net ([92.27.6.192]:50992 "EHLO nabal.armitage.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933018AbcFOVnU (ORCPT ); Wed, 15 Jun 2016 17:43:20 -0400 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 v3 3/4] ipvs: Don't check result < 0 after setting result = 0 Date: Wed, 15 Jun 2016 22:42:43 +0100 Message-Id: <1466026964-14114-4-git-send-email-quentin@armitage.org.uk> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1466026964-14114-1-git-send-email-quentin@armitage.org.uk> References: <1465914262-30112-1-git-send-email-quentin@armitage.org.uk> <1466026964-14114-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 | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c index fbc5ba4..2be99b2 100644 --- a/net/netfilter/ipvs/ip_vs_sync.c +++ b/net/netfilter/ipvs/ip_vs_sync.c @@ -1496,13 +1496,14 @@ static struct socket *make_send_sock(struct netns_ipvs *ipvs, int id, if (result > 0) set_sock_size(sock->sk, 1, result); - if (AF_INET == ipvs->mcfg.mcast_af) + if (ipvs->mcfg.mcast_af == AF_INET) { result = bind_mcastif_addr(sock, dev); - else + if (result < 0) { + pr_err("Error binding address of 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); -- 1.7.7.6