aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/inet_connection_sock.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-06-16 21:25:48 -0400
committerDavid S. Miller <davem@davemloft.net>2008-06-16 21:25:48 -0400
commitcaea902f72b053fd0c76d0d3b6b2e057beb3fc64 (patch)
tree74e8d476b2c51480420e2ef7c9bbae249b6edbc9 /net/ipv4/inet_connection_sock.c
parent0b4419162aa6c4204843f3a13b48d9ab821d3167 (diff)
parent65c3e4715b1b934f8dcc002d9f46b4371ca7a9b1 (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/wireless/rt2x00/Kconfig drivers/net/wireless/rt2x00/rt2x00usb.c net/sctp/protocol.c
Diffstat (limited to 'net/ipv4/inet_connection_sock.c')
-rw-r--r--net/ipv4/inet_connection_sock.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
index 4c804b3c287b..5bbf00051512 100644
--- a/net/ipv4/inet_connection_sock.c
+++ b/net/ipv4/inet_connection_sock.c
@@ -468,9 +468,9 @@ void inet_csk_reqsk_queue_prune(struct sock *parent,
468 reqp=&lopt->syn_table[i]; 468 reqp=&lopt->syn_table[i];
469 while ((req = *reqp) != NULL) { 469 while ((req = *reqp) != NULL) {
470 if (time_after_eq(now, req->expires)) { 470 if (time_after_eq(now, req->expires)) {
471 if ((req->retrans < (inet_rsk(req)->acked ? max_retries : thresh)) && 471 if ((req->retrans < thresh ||
472 (inet_rsk(req)->acked || 472 (inet_rsk(req)->acked && req->retrans < max_retries))
473 !req->rsk_ops->rtx_syn_ack(parent, req))) { 473 && !req->rsk_ops->rtx_syn_ack(parent, req)) {
474 unsigned long timeo; 474 unsigned long timeo;
475 475
476 if (req->retrans++ == 0) 476 if (req->retrans++ == 0)