]> err.no Git - linux-2.6/commitdiff
[CCID3] Initialize more fields in ccid3_hc_rx_init
authorArnaldo Carvalho de Melo <acme@mandriva.com>
Fri, 9 Sep 2005 05:37:05 +0000 (02:37 -0300)
committerArnaldo Carvalho de Melo <acme@mandriva.com>
Fri, 9 Sep 2005 05:37:05 +0000 (02:37 -0300)
The initialization of ccid3hcrx_rtt to 5ms is just a bandaid, I'll continue
auditing the CCID3 HC rx codebase to fix this properly, probably I'll add a
feedback timer as suggested in the CCID3 draft.

Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
net/dccp/ccids/ccid3.c

index 0804b3e435c878a64f3bac76fd9b31c70360ff85..145aafafe4e271a29ece1ace85d71451c82be056 100644 (file)
@@ -1100,11 +1100,9 @@ static int ccid3_hc_rx_init(struct sock *sk)
        hcrx->ccid3hcrx_state = TFRC_RSTATE_NO_DATA;
        INIT_LIST_HEAD(&hcrx->ccid3hcrx_hist);
        INIT_LIST_HEAD(&hcrx->ccid3hcrx_li_hist);
-       /*
-        * XXX this seems to be paranoid, need to think more about this, for
-        * now start with something different than zero. -acme
-        */
-       hcrx->ccid3hcrx_rtt = USEC_PER_SEC / 5;
+       do_gettimeofday(&hcrx->ccid3hcrx_tstamp_last_ack);
+       hcrx->ccid3hcrx_tstamp_last_feedback = hcrx->ccid3hcrx_tstamp_last_ack;
+       hcrx->ccid3hcrx_rtt = 5000; /* XXX 5ms for now... */
        return 0;
 }