]> git.baikalelectronics.ru Git - kernel.git/commit
inet: Remove an unnecessary argument of syn_ack_recalc().
authorKuniyuki Iwashima <kuniyu@amazon.co.jp>
Fri, 10 Jul 2020 15:57:59 +0000 (00:57 +0900)
committerDavid S. Miller <davem@davemloft.net>
Fri, 10 Jul 2020 21:37:57 +0000 (14:37 -0700)
commita594920f8747fa032c784c3660d6cd5a8ab291f8
treedb0205b9242451d6fe55331473e48228ca5e9b93
parentac4cd4781eacd1fd185c85522e869bd5d3254b96
inet: Remove an unnecessary argument of syn_ack_recalc().

Commit 0c3d79bce48034018e840468ac5a642894a521a3 ("tcp: reduce SYN-ACK
retrans for TCP_DEFER_ACCEPT") introduces syn_ack_recalc() which decides
if a minisock is held and a SYN+ACK is retransmitted or not.

If rskq_defer_accept is not zero in syn_ack_recalc(), max_retries always
has the same value because max_retries is overwritten by rskq_defer_accept
in reqsk_timer_handler().

This commit adds three changes:
- remove redundant non-zero check for rskq_defer_accept in
   reqsk_timer_handler().
- remove max_retries from the arguments of syn_ack_recalc() and use
   rskq_defer_accept instead.
- rename thresh to max_syn_ack_retries for readability.

Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.co.jp>
Reviewed-by: Benjamin Herrenschmidt <benh@amazon.com>
CC: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/inet_connection_sock.c