[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>

2 files changed, 14 insertions, 14 deletions

diff --git a/net/dccp/ccids/lib/loss_interval.c b/net/dccp/ccids/lib/loss_interval.c
index 39980d1f5352..8b962c1f14b8 100644
--- a/net/dccp/ccids/lib/loss_interval.c
+++ b/net/dccp/ccids/lib/loss_interval.c
@@ -435,18 +435,18 @@ int tfrc_lh_interval_add(struct tfrc_loss_hist *lh, struct tfrc_rx_hist *rh,
 }
 EXPORT_SYMBOL_GPL(tfrc_lh_interval_add);
 
-int __init dccp_li_init(void)
+int __init tfrc_li_init(void)
 {
-        dccp_li_cachep = kmem_cache_create("dccp_li_hist",
-                                           sizeof(struct dccp_li_hist_entry),
-                                           0, SLAB_HWCACHE_ALIGN, NULL);
-        return dccp_li_cachep == NULL ? -ENOBUFS : 0;
+        tfrc_lh_slab = kmem_cache_create("tfrc_li_hist",
+                                         sizeof(struct tfrc_loss_interval), 0,
+                                         SLAB_HWCACHE_ALIGN, NULL);
+        return tfrc_lh_slab == NULL ? -ENOBUFS : 0;
 }
 
-void dccp_li_exit(void)
+void tfrc_li_exit(void)
 {
-        if (dccp_li_cachep != NULL) {
-                kmem_cache_destroy(dccp_li_cachep);
-                dccp_li_cachep = NULL;
+        if (tfrc_lh_slab != NULL) {
+                kmem_cache_destroy(tfrc_lh_slab);
+                tfrc_lh_slab = NULL;
         }
 }
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);
 extern int  tfrc_rx_packet_history_init(void);
 extern void tfrc_rx_packet_history_exit(void);
 
-extern int  dccp_li_init(void);
-extern void dccp_li_exit(void);
+extern int  tfrc_li_init(void);
+extern void tfrc_li_exit(void);
 
 static int __init tfrc_module_init(void)
 {
-        int rc = dccp_li_init();
+        int rc = tfrc_li_init();
 
         if (rc)
                 goto out;
@@ -41,7 +41,7 @@ static int __init tfrc_module_init(void)
 out_free_tx_history:
         tfrc_tx_packet_history_exit();
 out_free_loss_intervals:
-        dccp_li_exit();
+        tfrc_li_exit();
 out:
         return rc;
 }
@@ -50,7 +50,7 @@ static void __exit tfrc_module_exit(void)
 {
         tfrc_rx_packet_history_exit();
         tfrc_tx_packet_history_exit();
-        dccp_li_exit();
+        tfrc_li_exit();
 }
 
 module_init(tfrc_module_init);