[DCCP]: Shift the retransmit timer for active-close into output.c

When performing active close, RFC 4340, 8.3. requires to retransmit the
Close/CloseReq with a backoff-retransmit timer starting at intially 2 RTTs.

This patch shifts the existing code for active-close retransmit timer
into output.c, so that the retransmit timer is started when the first
Close/CloseReq is sent. Previously, the timer was started when, after
releasing the socket in dccp_close(), the actively-closing side had not yet
reached the CLOSED/TIMEWAIT state.

The patch further reduces the initial timeout from 3 seconds to the required
2 RTTs, where - in absence of a known RTT - the fallback value specified in
RFC 4340, 3.4 is used.

Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: Ian McDonald <ian.mcdonald@jandi.co.nz>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 0 insertions, 18 deletions

diff --git a/net/dccp/proto.c b/net/dccp/proto.c
index 60f40ec72ff3..8a73c8f98d76 100644
--- a/net/dccp/proto.c
+++ b/net/dccp/proto.c
@@ -996,24 +996,6 @@ adjudge_to_death:
         if (state != DCCP_CLOSED && sk->sk_state == DCCP_CLOSED)
                 goto out;
 
-        /*
-         * The last release_sock may have processed the CLOSE or RESET
-         * packet moving sock to CLOSED state, if not we have to fire
-         * the CLOSE/CLOSEREQ retransmission timer, see "8.3. Termination"
-         * in draft-ietf-dccp-spec-11. -acme
-         */
-        if (sk->sk_state == DCCP_CLOSING) {
-                /* FIXME: should start at 2 * RTT */
-                /* Timer for repeating the CLOSE/CLOSEREQ until an answer. */
-                inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS,
-                                          inet_csk(sk)->icsk_rto,
-                                          DCCP_RTO_MAX);
-#if 0
-                /* Yeah, we should use sk->sk_prot->orphan_count, etc */
-                dccp_set_state(sk, DCCP_CLOSED);
-#endif
-        }
-
         if (sk->sk_state == DCCP_CLOSED)
                 inet_csk_destroy_sock(sk);