From f02426e636cdaf1b0002fb054816b626e0cf5049 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Mon, 16 Jun 2008 16:57:40 -0700 Subject: [PATCH] --- yaml --- r: 98219 b: refs/heads/master c: 93653e0448196344d7699ccad395eaebd30359d1 h: refs/heads/master i: 98217: 0b2144e43d04f811a999fcb2a772a7cea9ebf9c7 98215: 891021e7819b817dbec17ab505b3e0f3407795ec v: v3 --- [refs] | 2 +- trunk/net/ipv4/inet_connection_sock.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f4e1a634e160..9ad1e2b68571 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2b4743bd6be9fedaa560f8c6dc3997e9ec21b99b +refs/heads/master: 93653e0448196344d7699ccad395eaebd30359d1 diff --git a/trunk/net/ipv4/inet_connection_sock.c b/trunk/net/ipv4/inet_connection_sock.c index 045e799d3e1d..ec834480abe7 100644 --- a/trunk/net/ipv4/inet_connection_sock.c +++ b/trunk/net/ipv4/inet_connection_sock.c @@ -466,9 +466,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)) && - (inet_rsk(req)->acked || - !req->rsk_ops->rtx_syn_ack(parent, req))) { + if ((req->retrans < thresh || + (inet_rsk(req)->acked && req->retrans < max_retries)) + && !req->rsk_ops->rtx_syn_ack(parent, req)) { unsigned long timeo; if (req->retrans++ == 0)