From 609e32f598ba74ced6b24726b5f64507c42162a5 Mon Sep 17 00:00:00 2001
From: Patrick McManus <mcmanus@ducksong.com>
Date: Fri, 21 Mar 2008 16:27:38 -0700
Subject: [PATCH] --- yaml --- r: 90198 b: refs/heads/master c:
 539fae89bebd16ebeafd57a87169bc56eb530d76 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/net/ipv4/inet_connection_sock.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 386cfb3f3483..6817ebc34307 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4cd9029d25f6612302f82634620f107c65f790b1
+refs/heads/master: 539fae89bebd16ebeafd57a87169bc56eb530d76
diff --git a/trunk/net/ipv4/inet_connection_sock.c b/trunk/net/ipv4/inet_connection_sock.c
index c0e0fa03fce1..f24c7d534081 100644
--- a/trunk/net/ipv4/inet_connection_sock.c
+++ b/trunk/net/ipv4/inet_connection_sock.c
@@ -461,8 +461,7 @@ void inet_csk_reqsk_queue_prune(struct sock *parent,
 		reqp=&lopt->syn_table[i];
 		while ((req = *reqp) != NULL) {
 			if (time_after_eq(now, req->expires)) {
-				if ((req->retrans < thresh ||
-				     (inet_rsk(req)->acked && req->retrans < max_retries))
+				if ((req->retrans < (inet_rsk(req)->acked ? max_retries : thresh))
 				    && !req->rsk_ops->rtx_syn_ack(parent, req)) {
 					unsigned long timeo;