---

yaml --- r: 90199 b: refs/heads/master c: e4c7884 h: refs/heads/master i: 90197: a97c4be 90195: 0f87473 90191: 769d1e3 v: v3
git-mirror · Mar 21, 2008 · e26bc40 · e26bc40
1 parent 609e32f
commit e26bc40
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 539fae89bebd16ebeafd57a87169bc56eb530d76
+refs/heads/master: e4c78840284f3f51b1896cf3936d60a6033c4d2c
diff --git a/trunk/net/ipv4/inet_connection_sock.c b/trunk/net/ipv4/inet_connection_sock.c
@@ -461,8 +461,9 @@ 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 < (inet_rsk(req)->acked ? max_retries : thresh))
-				    && !req->rsk_ops->rtx_syn_ack(parent, req)) {
+				if ((req->retrans < (inet_rsk(req)->acked ? max_retries : thresh)) &&
+				    (inet_rsk(req)->acked ||
+				     !req->rsk_ops->rtx_syn_ack(parent, req))) {
 					unsigned long timeo;
 
 					if (req->retrans++ == 0)