diff options
| author | Gerrit Renker <gerrit@erg.abdn.ac.uk> | 2007-12-12 12:24:49 -0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 14:57:15 -0800 |
| commit | df8f83fdd6369e1ba85f089fd6fe26bb2ddcb36f (patch) | |
| tree | 8ddb2e0b70d5ed99837919ada6664e70c876f119 /net/dccp/ccids/lib/tfrc.c | |
| parent | 2aaef4e47fef8a6c0bc7fc5d9d3eea4af290e04c (diff) | |
| download | linux-df8f83fdd6369e1ba85f089fd6fe26bb2ddcb36f.tar.gz | |
[TFRC]: Put RX/TX initialisation into tfrc.c
This separates RX/TX initialisation and puts all packet history / loss intervals
initialisation into tfrc.c.
The organisation is uniform: slab declaration -> {rx,tx}_init() -> {rx,tx}_exit()
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
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.c | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/net/dccp/ccids/lib/tfrc.c b/net/dccp/ccids/lib/tfrc.c index 3a7a1838a64b..20763fa75d44 100644 --- a/net/dccp/ccids/lib/tfrc.c +++ b/net/dccp/ccids/lib/tfrc.c @@ -14,27 +14,42 @@ module_param(tfrc_debug, bool, 0444); MODULE_PARM_DESC(tfrc_debug, "Enable debug messages"); #endif +extern int tfrc_tx_packet_history_init(void); +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 packet_history_init(void); -extern void packet_history_exit(void); static int __init tfrc_module_init(void) { int rc = dccp_li_init(); - if (rc == 0) { - rc = packet_history_init(); - if (rc != 0) - dccp_li_exit(); - } + if (rc) + goto out; + + rc = tfrc_tx_packet_history_init(); + if (rc) + goto out_free_loss_intervals; + rc = tfrc_rx_packet_history_init(); + if (rc) + goto out_free_tx_history; + return 0; + +out_free_tx_history: + tfrc_tx_packet_history_exit(); +out_free_loss_intervals: + dccp_li_exit(); +out: return rc; } static void __exit tfrc_module_exit(void) { - packet_history_exit(); + tfrc_rx_packet_history_exit(); + tfrc_tx_packet_history_exit(); dccp_li_exit(); } |