diff options
author | Eric Dumazet <edumazet@google.com> | 2012-04-12 18:16:05 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-04-14 15:24:26 -0400 |
commit | c72e118334a2590f4f07d9e51490b902c33f5280 (patch) | |
tree | d8974faaaf6afa5afe2b771e3a5390ee6ec97c21 /net/ipv4/inet_connection_sock.c | |
parent | fd4f2cead6983735a4e6283126b9276873d7ff09 (diff) |
inet: makes syn_ack_timeout mandatory
There are two struct request_sock_ops providers, tcp and dccp.
inet_csk_reqsk_queue_prune() can avoid testing syn_ack_timeout being
NULL if we make it non NULL like syn_ack_timeout
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Cc: dccp@vger.kernel.org
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 c12396f2785f..d19f32aca6ca 100644 --- a/net/ipv4/inet_connection_sock.c +++ b/net/ipv4/inet_connection_sock.c | |||
@@ -555,8 +555,7 @@ void inet_csk_reqsk_queue_prune(struct sock *parent, | |||
555 | syn_ack_recalc(req, thresh, max_retries, | 555 | syn_ack_recalc(req, thresh, max_retries, |
556 | queue->rskq_defer_accept, | 556 | queue->rskq_defer_accept, |
557 | &expire, &resend); | 557 | &expire, &resend); |
558 | if (req->rsk_ops->syn_ack_timeout) | 558 | req->rsk_ops->syn_ack_timeout(parent, req); |
559 | req->rsk_ops->syn_ack_timeout(parent, req); | ||
560 | if (!expire && | 559 | if (!expire && |
561 | (!resend || | 560 | (!resend || |
562 | !req->rsk_ops->rtx_syn_ack(parent, req, NULL) || | 561 | !req->rsk_ops->rtx_syn_ack(parent, req, NULL) || |