diff options
author | Arnaldo Carvalho de Melo <acme@mandriva.com> | 2005-09-09 18:58:18 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@mandriva.com> | 2005-09-09 18:58:18 -0400 |
commit | d7e0fb985cb033e605c3167ff183b5e98b7f7644 (patch) | |
tree | 42e966c189f4ffef2321c3ae7483b862e4c5102e | |
parent | cb7b593c2c808b32a1ea188599713c434b95f849 (diff) |
[CCID3] Initialize ccid3hctx_t_ipi to 250ms
To match more closely what is described in RFC 3448.
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: Ian McDonald <iam4@cs.waikato.ac.nz>
-rw-r--r-- | net/dccp/ccids/ccid3.c | 2 | ||||
-rw-r--r-- | net/dccp/ccids/ccid3.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/net/dccp/ccids/ccid3.c b/net/dccp/ccids/ccid3.c index ea30012dd195..4467a74e6f40 100644 --- a/net/dccp/ccids/ccid3.c +++ b/net/dccp/ccids/ccid3.c | |||
@@ -328,7 +328,7 @@ static int ccid3_hc_tx_send_packet(struct sock *sk, | |||
328 | hctx->ccid3hctx_last_win_count = 0; | 328 | hctx->ccid3hctx_last_win_count = 0; |
329 | hctx->ccid3hctx_t_last_win_count = now; | 329 | hctx->ccid3hctx_t_last_win_count = now; |
330 | ccid3_hc_tx_set_state(sk, TFRC_SSTATE_NO_FBACK); | 330 | ccid3_hc_tx_set_state(sk, TFRC_SSTATE_NO_FBACK); |
331 | hctx->ccid3hctx_t_ipi = TFRC_INITIAL_TIMEOUT; | 331 | hctx->ccid3hctx_t_ipi = TFRC_INITIAL_IPI; |
332 | 332 | ||
333 | /* Set nominal send time for initial packet */ | 333 | /* Set nominal send time for initial packet */ |
334 | hctx->ccid3hctx_t_nom = now; | 334 | hctx->ccid3hctx_t_nom = now; |
diff --git a/net/dccp/ccids/ccid3.h b/net/dccp/ccids/ccid3.h index d16f00d784f3..eb248778eea3 100644 --- a/net/dccp/ccids/ccid3.h +++ b/net/dccp/ccids/ccid3.h | |||
@@ -48,6 +48,8 @@ | |||
48 | /* Two seconds as per CCID3 spec */ | 48 | /* Two seconds as per CCID3 spec */ |
49 | #define TFRC_INITIAL_TIMEOUT (2 * USEC_PER_SEC) | 49 | #define TFRC_INITIAL_TIMEOUT (2 * USEC_PER_SEC) |
50 | 50 | ||
51 | #define TFRC_INITIAL_IPI (USEC_PER_SEC / 4) | ||
52 | |||
51 | /* In usecs - half the scheduling granularity as per RFC3448 4.6 */ | 53 | /* In usecs - half the scheduling granularity as per RFC3448 4.6 */ |
52 | #define TFRC_OPSYS_HALF_TIME_GRAN (USEC_PER_SEC / (2 * HZ)) | 54 | #define TFRC_OPSYS_HALF_TIME_GRAN (USEC_PER_SEC / (2 * HZ)) |
53 | 55 | ||