diff options
| author | Arnaldo Carvalho de Melo <acme@ghostprotocols.net> | 2005-08-09 20:15:09 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2005-08-29 15:49:50 -0700 |
| commit | a019d6fe2b9da68ea4ba6cf3c4e86fc1dbf554c3 (patch) | |
| tree | f82f0523c313228d64998fac30790edcfd0785c3 /net/dccp/timer.c | |
| parent | 7c657876b63cb1d8a2ec06f8fc6c37bb8412e66c (diff) | |
| download | olio-linux-3.10-a019d6fe2b9da68ea4ba6cf3c4e86fc1dbf554c3.tar.xz olio-linux-3.10-a019d6fe2b9da68ea4ba6cf3c4e86fc1dbf554c3.zip | |
[ICSK]: Move generalised functions from tcp to inet_connection_sock
This also improves reqsk_queue_prune and renames it to
inet_csk_reqsk_queue_prune, as it deals with both inet_connection_sock
and inet_request_sock objects, not just with request_sock ones thus
belonging to inet_request_sock.
Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp/timer.c')
| -rw-r--r-- | net/dccp/timer.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/net/dccp/timer.c b/net/dccp/timer.c index 8c396ee01aa..9f1f1ab9e2b 100644 --- a/net/dccp/timer.c +++ b/net/dccp/timer.c @@ -220,11 +220,7 @@ out: */ static void dccp_response_timer(struct sock *sk) { - struct inet_connection_sock *icsk = inet_csk(sk); - const int max_retries = icsk->icsk_syn_retries ? : TCP_SYNACK_RETRIES /* FIXME sysctl_tcp_synack_retries */; - - reqsk_queue_prune(&icsk->icsk_accept_queue, sk, TCP_SYNQ_INTERVAL, - DCCP_TIMEOUT_INIT, DCCP_RTO_MAX, max_retries); + inet_csk_reqsk_queue_prune(sk, TCP_SYNQ_INTERVAL, DCCP_TIMEOUT_INIT, DCCP_RTO_MAX); } static void dccp_keepalive_timer(unsigned long data) |