diff options
author | Arnaldo Carvalho de Melo <acme@mandriva.com> | 2005-08-27 22:50:46 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2005-08-29 19:12:33 -0400 |
commit | 5cea0ddce56ff3406a81fbbab80ef45c65701673 (patch) | |
tree | 84e5e9ead29dd53358394407479735034314cca1 | |
parent | 4524b259541e1eea07020af825d8e7b0e4faaec5 (diff) |
[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>
-rw-r--r-- | net/dccp/ccids/Kconfig | 4 | ||||
-rw-r--r-- | net/dccp/ccids/Makefile | 4 | ||||
-rw-r--r-- | net/dccp/ccids/lib/Makefile | 3 | ||||
-rw-r--r-- | net/dccp/ccids/lib/packet_history.c | 6 |
4 files changed, 16 insertions, 1 deletions
diff --git a/net/dccp/ccids/Kconfig b/net/dccp/ccids/Kconfig index 67f9c06bd179..7684d83946a4 100644 --- a/net/dccp/ccids/Kconfig +++ b/net/dccp/ccids/Kconfig | |||
@@ -22,4 +22,8 @@ config IP_DCCP_CCID3 | |||
22 | 22 | ||
23 | If in doubt, say M. | 23 | If in doubt, say M. |
24 | 24 | ||
25 | config IP_DCCP_TFRC_LIB | ||
26 | depends on IP_DCCP_CCID3 | ||
27 | def_tristate IP_DCCP_CCID3 | ||
28 | |||
25 | endmenu | 29 | endmenu |
diff --git a/net/dccp/ccids/Makefile b/net/dccp/ccids/Makefile index 29eb1b61fdbd..956f79f50743 100644 --- a/net/dccp/ccids/Makefile +++ b/net/dccp/ccids/Makefile | |||
@@ -1,3 +1,5 @@ | |||
1 | obj-$(CONFIG_IP_DCCP_CCID3) += dccp_ccid3.o | 1 | obj-$(CONFIG_IP_DCCP_CCID3) += dccp_ccid3.o |
2 | 2 | ||
3 | dccp_ccid3-y := ccid3.o lib/loss_interval.o lib/packet_history.o | 3 | dccp_ccid3-y := ccid3.o |
4 | |||
5 | obj-y += lib/ | ||
diff --git a/net/dccp/ccids/lib/Makefile b/net/dccp/ccids/lib/Makefile new file mode 100644 index 000000000000..e9a91e238c88 --- /dev/null +++ b/net/dccp/ccids/lib/Makefile | |||
@@ -0,0 +1,3 @@ | |||
1 | obj-$(CONFIG_IP_DCCP_TFRC_LIB) += dccp_tfrc_lib.o | ||
2 | |||
3 | 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 2d9ef5ae0bf6..f252a9555e31 100644 --- a/net/dccp/ccids/lib/packet_history.c +++ b/net/dccp/ccids/lib/packet_history.c | |||
@@ -35,6 +35,7 @@ | |||
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include <linux/config.h> | 37 | #include <linux/config.h> |
38 | #include <linux/module.h> | ||
38 | #include <linux/string.h> | 39 | #include <linux/string.h> |
39 | 40 | ||
40 | #include "packet_history.h" | 41 | #include "packet_history.h" |
@@ -197,3 +198,8 @@ void dccp_tx_hist_purge(struct dccp_tx_hist *hist, struct list_head *list) | |||
197 | } | 198 | } |
198 | 199 | ||
199 | EXPORT_SYMBOL_GPL(dccp_tx_hist_purge); | 200 | EXPORT_SYMBOL_GPL(dccp_tx_hist_purge); |
201 | |||
202 | MODULE_AUTHOR("Ian McDonald <iam4@cs.waikato.ac.nz>, " | ||
203 | "Arnaldo Carvalho de Melo <acme@ghostprotocols.net>"); | ||
204 | MODULE_DESCRIPTION("DCCP TFRC library"); | ||
205 | MODULE_LICENSE("GPL"); | ||