Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[CCID3] Initialize more fields in ccid3_hc_rx_init

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>

+3 -5
+3 -5
net/dccp/ccids/ccid3.c
··· 1100 1100 hcrx->ccid3hcrx_state = TFRC_RSTATE_NO_DATA; 1101 1101 INIT_LIST_HEAD(&hcrx->ccid3hcrx_hist); 1102 1102 INIT_LIST_HEAD(&hcrx->ccid3hcrx_li_hist); 1103 - /* 1104 - * XXX this seems to be paranoid, need to think more about this, for 1105 - * now start with something different than zero. -acme 1106 - */ 1107 - hcrx->ccid3hcrx_rtt = USEC_PER_SEC / 5; 1103 + do_gettimeofday(&hcrx->ccid3hcrx_tstamp_last_ack); 1104 + hcrx->ccid3hcrx_tstamp_last_feedback = hcrx->ccid3hcrx_tstamp_last_ack; 1105 + hcrx->ccid3hcrx_rtt = 5000; /* XXX 5ms for now... */ 1108 1106 return 0; 1109 1107 } 1110 1108