summaryrefslogtreecommitdiffstats
path: root/net/dccp/ccid.c
diff options
context:
space:
mode:
authorGerrit Renker <gerrit@erg.abdn.ac.uk>2009-01-04 21:45:33 -0800
committerDavid S. Miller <davem@davemloft.net>2009-01-04 21:45:33 -0800
commit129fa44785a399248ae2466b6cb5c655e96668f7 (patch)
treec2440b83e752c6cf3e6ec6f60492b85ddb8932a9 /net/dccp/ccid.c
parente5fd56ca4eb3a130882bbef69d6952ef6aca5c8d (diff)
downloadlinux-129fa44785a399248ae2466b6cb5c655e96668f7.tar.bz2
dccp: Integrate the TFRC library with DCCP
This patch integrates the TFRC library, which is a dependency of CCID-3 (and CCID-4), with the new use of CCIDs in the DCCP module. Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp/ccid.c')
-rw-r--r--net/dccp/ccid.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/net/dccp/ccid.c b/net/dccp/ccid.c
index 19b214ad5e06..f3e9ba1cfd01 100644
--- a/net/dccp/ccid.c
+++ b/net/dccp/ccid.c
@@ -12,6 +12,7 @@
*/
#include "ccid.h"
+#include "ccids/lib/tfrc.h"
static struct ccid_operations *ccids[] = {
&ccid2_ops,
@@ -199,7 +200,10 @@ void ccid_hc_tx_delete(struct ccid *ccid, struct sock *sk)
int __init ccid_initialize_builtins(void)
{
- int i, err;
+ int i, err = tfrc_lib_init();
+
+ if (err)
+ return err;
for (i = 0; i < ARRAY_SIZE(ccids); i++) {
err = ccid_activate(ccids[i]);
@@ -211,6 +215,7 @@ int __init ccid_initialize_builtins(void)
unwind_registrations:
while(--i >= 0)
ccid_deactivate(ccids[i]);
+ tfrc_lib_exit();
return err;
}
@@ -220,4 +225,5 @@ void ccid_cleanup_builtins(void)
for (i = 0; i < ARRAY_SIZE(ccids); i++)
ccid_deactivate(ccids[i]);
+ tfrc_lib_exit();
}