aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp/ccids/lib/tfrc.c
diff options
context:
space:
mode:
authorGerrit Renker <gerrit@erg.abdn.ac.uk>2007-12-12 11:06:14 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 17:57:20 -0500
commit954c2db868ce896325dced91d5fba5e2226897a4 (patch)
treed74b480530878c25eb770293d786f2e78ace90e7 /net/dccp/ccids/lib/tfrc.c
parentde0d411cb8ea51175f52d935faead5c542b6e007 (diff)
[CCID3]: Interface CCID3 code with newer Loss Intervals Database
This hooks up the TFRC Loss Interval database with CCID 3 packet reception. In addition, it makes the CCID-specific computation of the first loss interval (which requires access to all the guts of CCID3) local to ccid3.c. The patch also fixes an omission in the DCCP code, that of a default / fallback RTT value (defined in section 3.4 of RFC 4340 as 0.2 sec); while at it, the upper bound of 4 seconds for an RTT sample has been reduced to match the initial TCP RTO value of 3 seconds from[RFC 1122, 4.2.3.1]. 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>
Diffstat (limited to 'net/dccp/ccids/lib/tfrc.c')
-rw-r--r--net/dccp/ccids/lib/tfrc.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/dccp/ccids/lib/tfrc.c b/net/dccp/ccids/lib/tfrc.c
index 20763fa75d44..d1dfbb8de64c 100644
--- a/net/dccp/ccids/lib/tfrc.c
+++ b/net/dccp/ccids/lib/tfrc.c
@@ -19,12 +19,12 @@ extern void tfrc_tx_packet_history_exit(void);
19extern int tfrc_rx_packet_history_init(void); 19extern int tfrc_rx_packet_history_init(void);
20extern void tfrc_rx_packet_history_exit(void); 20extern void tfrc_rx_packet_history_exit(void);
21 21
22extern int dccp_li_init(void); 22extern int tfrc_li_init(void);
23extern void dccp_li_exit(void); 23extern void tfrc_li_exit(void);
24 24
25static int __init tfrc_module_init(void) 25static int __init tfrc_module_init(void)
26{ 26{
27 int rc = dccp_li_init(); 27 int rc = tfrc_li_init();
28 28
29 if (rc) 29 if (rc)
30 goto out; 30 goto out;
@@ -41,7 +41,7 @@ static int __init tfrc_module_init(void)
41out_free_tx_history: 41out_free_tx_history:
42 tfrc_tx_packet_history_exit(); 42 tfrc_tx_packet_history_exit();
43out_free_loss_intervals: 43out_free_loss_intervals:
44 dccp_li_exit(); 44 tfrc_li_exit();
45out: 45out:
46 return rc; 46 return rc;
47} 47}
@@ -50,7 +50,7 @@ static void __exit tfrc_module_exit(void)
50{ 50{
51 tfrc_rx_packet_history_exit(); 51 tfrc_rx_packet_history_exit();
52 tfrc_tx_packet_history_exit(); 52 tfrc_tx_packet_history_exit();
53 dccp_li_exit(); 53 tfrc_li_exit();
54} 54}
55 55
56module_init(tfrc_module_init); 56module_init(tfrc_module_init);