---

yaml --- r: 90198 b: refs/heads/master c: 539fae8 h: refs/heads/master v: v3
git-mirror · Mar 21, 2008 · 609e32f · 609e32f
1 parent a97c4be
commit 609e32f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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;