From 4165c429c164d148255989daf928b376346b98c9 Mon Sep 17 00:00:00 2001
From: Simon Horman <horms@verge.net.au>
Date: Tue, 9 Nov 2010 09:33:25 +0900
Subject: [PATCH] --- yaml --- r: 236579 b: refs/heads/master c:
 7ae246a15a5c9d26cfb572d36794325db0400b18 h: refs/heads/master i:   236577:
 f47216f379b1a5a41bd54155529855abb3edd38a   236575:
 de4a56ce68d8d20213b3002f8ce82d4fe6f384ce v: v3

---
 [refs]                                |  2 +-
 trunk/net/netfilter/ipvs/ip_vs_sync.c | 24 +++++++++++-------------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 503a726f9c1f..2269d9f28ec3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d494262b8a0f3507b62104a565849124abe29827
+refs/heads/master: 7ae246a15a5c9d26cfb572d36794325db0400b18
diff --git a/trunk/net/netfilter/ipvs/ip_vs_sync.c b/trunk/net/netfilter/ipvs/ip_vs_sync.c
index a4dccbc4f1bb..72b3d88d35f4 100644
--- a/trunk/net/netfilter/ipvs/ip_vs_sync.c
+++ b/trunk/net/netfilter/ipvs/ip_vs_sync.c
@@ -381,20 +381,18 @@ static void ip_vs_process_message(const char *buffer, const size_t buflen)
 			}
 		}
 
-		{
-			if (ip_vs_conn_fill_param_sync(AF_INET, s->protocol,
-					      (union nf_inet_addr *)&s->caddr,
-					      s->cport,
-					      (union nf_inet_addr *)&s->vaddr,
-					      s->vport, &param)) {
-				pr_err("ip_vs_conn_fill_param_sync failed");
-				return;
-			}
-			if (!(flags & IP_VS_CONN_F_TEMPLATE))
-				cp = ip_vs_conn_in_get(&param);
-			else
-				cp = ip_vs_ct_in_get(&param);
+		if (ip_vs_conn_fill_param_sync(AF_INET, s->protocol,
+					       (union nf_inet_addr *)&s->caddr,
+					       s->cport,
+					       (union nf_inet_addr *)&s->vaddr,
+					       s->vport, &param)) {
+			pr_err("ip_vs_conn_fill_param_sync failed");
+			return;
 		}
+		if (!(flags & IP_VS_CONN_F_TEMPLATE))
+			cp = ip_vs_conn_in_get(&param);
+		else
+			cp = ip_vs_ct_in_get(&param);
 		if (!cp) {
 			/*
 			 * Find the appropriate destination for the connection.