diff options
| author | Patrick McManus <mcmanus@ducksong.com> | 2008-03-21 16:27:38 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-21 16:27:38 -0700 |
| commit | 539fae89bebd16ebeafd57a87169bc56eb530d76 (patch) | |
| tree | 4c8e519043d6aba5f30a280ed478206b2cc313b1 /net/ipv4/inet_connection_sock.c | |
| parent | 4cd9029d25f6612302f82634620f107c65f790b1 (diff) | |
| download | blackbird-op-linux-539fae89bebd16ebeafd57a87169bc56eb530d76.tar.gz blackbird-op-linux-539fae89bebd16ebeafd57a87169bc56eb530d76.zip | |
[TCP]: TCP_DEFER_ACCEPT updates - defer timeout conflicts with max_thresh
timeout associated with SO_DEFER_ACCEPT wasn't being honored if it was
less than the timeout allowed by the maximum syn-recv queue size
algorithm. Fix by using the SO_DEFER_ACCEPT value if the ack has
arrived.
Signed-off-by: Patrick McManus <mcmanus@ducksong.com>
Acked-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/inet_connection_sock.c')
| -rw-r--r-- | net/ipv4/inet_connection_sock.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c index c0e0fa03fce1..f24c7d534081 100644 --- a/net/ipv4/inet_connection_sock.c +++ b/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; |
