[DCCP]: Introduce dccp_tfrc_lib module with net/dccp/ccids/lib/*.c

I'll now take a look at the other proposed TFRC DCCP CCIDs to find
more code that is now in ccid3.c and move to this module, the loss
event rate, calc_X, etc most probably will be moved there.

The main goal of these changes is to pave the way for the
implementation of more TFRC based DCCP CCIDs and to shrink ccid3.c,
reducing its complexity and helping in getting it rock solid.

Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/dccp/ccids/Kconfig b/net/dccp/ccids/Kconfig
index 67f9c06bd179d5c88e904598ffcc66a4b825efcc..7684d83946a423a36ad81ab536e058c85c21aa08 100644 (file)
--- a/net/dccp/ccids/Kconfig
+++ b/net/dccp/ccids/Kconfig
@@ -22,4 +22,8 @@ config IP_DCCP_CCID3
          
          If in doubt, say M.
 
+config IP_DCCP_TFRC_LIB
+       depends on IP_DCCP_CCID3
+       def_tristate IP_DCCP_CCID3
+
 endmenu

diff --git a/net/dccp/ccids/Makefile b/net/dccp/ccids/Makefile
index 29eb1b61fdbde754a8ac5579fc31ab176f1c92d8..956f79f50743da36c5c2dc04d5792ba41f3cd755 100644 (file)
--- a/net/dccp/ccids/Makefile
+++ b/net/dccp/ccids/Makefile
@@ -1,3 +1,5 @@
 obj-$(CONFIG_IP_DCCP_CCID3) += dccp_ccid3.o
 
-dccp_ccid3-y := ccid3.o lib/loss_interval.o lib/packet_history.o
+dccp_ccid3-y := ccid3.o
+
+obj-y += lib/

diff --git a/net/dccp/ccids/lib/Makefile b/net/dccp/ccids/lib/Makefile
new file mode 100644 (file)
index 0000000..e9a91e2
--- /dev/null
+++ b/net/dccp/ccids/lib/Makefile
@@ -0,0 +1,3 @@
+obj-$(CONFIG_IP_DCCP_TFRC_LIB) += dccp_tfrc_lib.o
+
+dccp_tfrc_lib-y := loss_interval.o packet_history.o

diff --git a/net/dccp/ccids/lib/packet_history.c b/net/dccp/ccids/lib/packet_history.c
index 2d9ef5ae0bf6984a2b8067d6983280ccf14a0b4b..f252a9555e313b97fe86e2fd1f2d0f67c60afe0c 100644 (file)
--- a/net/dccp/ccids/lib/packet_history.c
+++ b/net/dccp/ccids/lib/packet_history.c
@@ -35,6 +35,7 @@
  */
 
 #include <linux/config.h>
+#include <linux/module.h>
 #include <linux/string.h>
 
 #include "packet_history.h"
@@ -197,3 +198,8 @@ void dccp_tx_hist_purge(struct dccp_tx_hist *hist, struct list_head *list)
 }
 
 EXPORT_SYMBOL_GPL(dccp_tx_hist_purge);
+
+MODULE_AUTHOR("Ian McDonald <iam4@cs.waikato.ac.nz>, "
+             "Arnaldo Carvalho de Melo <acme@ghostprotocols.net>");
+MODULE_DESCRIPTION("DCCP TFRC library");
+MODULE_LICENSE("GPL");