From: Arnaldo Carvalho de Melo Date: Fri, 9 Sep 2005 22:58:18 +0000 (-0300) Subject: [CCID3] Initialize ccid3hctx_t_ipi to 250ms X-Git-Tag: v2.6.14-rc1~125^2~1^2~2^2~2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d7e0fb985cb033e605c3167ff183b5e98b7f7644;p=linux-2.6-omap-h63xx.git [CCID3] Initialize ccid3hctx_t_ipi to 250ms To match more closely what is described in RFC 3448. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Ian McDonald --- diff --git a/net/dccp/ccids/ccid3.c b/net/dccp/ccids/ccid3.c index ea30012dd19..4467a74e6f4 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, hctx->ccid3hctx_last_win_count = 0; hctx->ccid3hctx_t_last_win_count = now; ccid3_hc_tx_set_state(sk, TFRC_SSTATE_NO_FBACK); - hctx->ccid3hctx_t_ipi = TFRC_INITIAL_TIMEOUT; + hctx->ccid3hctx_t_ipi = TFRC_INITIAL_IPI; /* Set nominal send time for initial packet */ hctx->ccid3hctx_t_nom = now; diff --git a/net/dccp/ccids/ccid3.h b/net/dccp/ccids/ccid3.h index d16f00d784f..eb248778eea 100644 --- a/net/dccp/ccids/ccid3.h +++ b/net/dccp/ccids/ccid3.h @@ -48,6 +48,8 @@ /* Two seconds as per CCID3 spec */ #define TFRC_INITIAL_TIMEOUT (2 * USEC_PER_SEC) +#define TFRC_INITIAL_IPI (USEC_PER_SEC / 4) + /* In usecs - half the scheduling granularity as per RFC3448 4.6 */ #define TFRC_OPSYS_HALF_TIME_GRAN (USEC_PER_SEC / (2 * HZ))