![]() |
lvs-devel
|
| To: | Wensong Zhang <wensong@xxxxxxxxxxxx>, Simon Horman <horms@xxxxxxxxxxxx>, Julian Anastasov <ja@xxxxxx>, Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx>, Patrick McHardy <kaber@xxxxxxxxx>, Jozsef Kadlecsik <kadlec@xxxxxxxxxxxxxxxxx>, "David S. Miller" <davem@xxxxxxxxxxxxx>, netdev@xxxxxxxxxxxxxxx, lvs-devel@xxxxxxxxxxxxxxx, netfilter-devel@xxxxxxxxxxxxxxx, coreteam@xxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx |
|---|---|
| Subject: | [PATCH 3/5] ipvs: Don't check result < 0 after setting result = 0 |
| Cc: | Quentin Armitage <quentin@xxxxxxxxxxxxxxx> |
| From: | Quentin Armitage <quentin@xxxxxxxxxxxxxxx> |
| Date: | Tue, 14 Jun 2016 02:43:31 +0100 |
Move the block testing result < 0 to avoid the test immediately
after setting result = 0
Signed-off-by: Quentin Armitage <quentin@xxxxxxxxxxxxxxx>
---
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
--
To unsubscribe from this list: send the line "unsubscribe lvs-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| ||
| Previous by Date: | [PATCH 4/5] ipvs: Lock socket before setting SK_CAN_REUSE, Quentin Armitage |
|---|---|
| Next by Date: | [PATCH 0/5] ipvs: fix backup sync daemon with IPv6, and minor updates, Quentin Armitage |
| Previous by Thread: | Re: [PATCH 4/5] ipvs: Lock socket before setting SK_CAN_REUSE, Eric Dumazet |
| Next by Thread: | [PATCH 5/5] ipvs: log additional sync daemon parameters, Quentin Armitage |
| Indexes: | [Date] [Thread] [Top] [All Lists] |