summaryrefslogtreecommitdiffstats
path: root/net/ipv4/inet_connection_sock.c
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2012-04-12 22:16:05 +0000
committerDavid S. Miller <davem@davemloft.net>2012-04-14 15:24:26 -0400
commitc72e118334a2590f4f07d9e51490b902c33f5280 (patch)
treed8974faaaf6afa5afe2b771e3a5390ee6ec97c21 /net/ipv4/inet_connection_sock.c
parentfd4f2cead6983735a4e6283126b9276873d7ff09 (diff)
downloadop-kernel-dev-c72e118334a2590f4f07d9e51490b902c33f5280.zip
op-kernel-dev-c72e118334a2590f4f07d9e51490b902c33f5280.tar.gz
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.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
index c12396f..d19f32a 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,
syn_ack_recalc(req, thresh, max_retries,
queue->rskq_defer_accept,
&expire, &resend);
- if (req->rsk_ops->syn_ack_timeout)
- req->rsk_ops->syn_ack_timeout(parent, req);
+ req->rsk_ops->syn_ack_timeout(parent, req);
if (!expire &&
(!resend ||
!req->rsk_ops->rtx_syn_ack(parent, req, NULL) ||
OpenPOWER on IntegriCloud