[PATCH net-next v4 2/3] ipvs: Don't check result < 0 after setting result = 0
From: Quentin Armitage <hidden>
Date: 2016-06-16 07:00:43
Also in:
lkml, lvs-devel, netfilter-devel
Subsystem:
ipvs, netfilter, networking [general], the rest · Maintainers:
Simon Horman, Julian Anastasov, Pablo Neira Ayuso, Florian Westphal, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
Move the block testing result < 0 to avoid the test immediately after setting result = 0 Signed-off-by: Quentin Armitage <redacted> --- 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