Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c40616c5 authored by Gerrit Renker's avatar Gerrit Renker Committed by David S. Miller
Browse files

[TFRC]: Provide central source file and debug facility 



This patch changes the tfrc_lib module in the following manner:

 (1) a dedicated tfrc source file to call the packet history &
     loss interval init/exit functions.
 (2) a dedicated tfrc_pr_debug macro with toggle switch `tfrc_debug'.

Commiter note: renamed tfrc_module.c to tfrc.c, and made CONFIG_IP_DCCP_CCID3
select IP_DCCP_TFRC_LIB.

Signed-off-by: default avatarGerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: default avatarIan McDonald <ian.mcdonald@jandi.co.nz>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f8b33fdf

net/dccp/ccids/Kconfig

+9 −4
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ config IP_DCCP_CCID2_DEBUG 
config IP_DCCP_CCID3

	tristate "CCID3 (TCP-Friendly) (EXPERIMENTAL)"

	def_tristate IP_DCCP

	select IP_DCCP_TFRC_LIB

	---help---

	  CCID 3 denotes TCP-Friendly Rate Control (TFRC), an equation-based

	  rate-controlled congestion control mechanism.  TFRC is designed to
@@ -63,10 +64,6 @@ config IP_DCCP_CCID3 


	  If in doubt, say M.



config IP_DCCP_TFRC_LIB

	depends on IP_DCCP_CCID3

	def_tristate IP_DCCP_CCID3



config IP_DCCP_CCID3_DEBUG

	  bool "CCID3 debugging messages"

	  depends on IP_DCCP_CCID3
@@ -110,5 +107,13 @@ config IP_DCCP_CCID3_RTO 
	    is serious network congestion: experimenting with larger values should

	    therefore not be performed on WANs.



config IP_DCCP_TFRC_LIB

	tristate

	default n



config IP_DCCP_TFRC_DEBUG

	bool

	depends on IP_DCCP_TFRC_LIB

	default y if IP_DCCP_CCID3_DEBUG



endmenu

net/dccp/ccids/lib/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_IP_DCCP_TFRC_LIB) += dccp_tfrc_lib.o



dccp_tfrc_lib-y := loss_interval.o packet_history.o tfrc_equation.o
 
dccp_tfrc_lib-y := tfrc.o tfrc_equation.o packet_history.o loss_interval.o

net/dccp/ccids/lib/packet_history.c

+3 −24
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 
 *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

 */



#include <linux/module.h>

#include <linux/string.h>

#include "packet_history.h"
@@ -277,39 +276,19 @@ void dccp_rx_hist_purge(struct dccp_rx_hist *hist, struct list_head *list) 


EXPORT_SYMBOL_GPL(dccp_rx_hist_purge);



extern int __init dccp_li_init(void);

extern void dccp_li_exit(void);



static __init int packet_history_init(void)

__init int packet_history_init(void)

{

	if (dccp_li_init() != 0)

		goto out;



	tfrc_tx_hist = kmem_cache_create("tfrc_tx_hist",

					 sizeof(struct tfrc_tx_hist_entry), 0,

					 SLAB_HWCACHE_ALIGN, NULL);

	if (tfrc_tx_hist == NULL)

		goto out_li_exit;



	return 0;

out_li_exit:

	dccp_li_exit();

out:

	return -ENOBUFS;

	return tfrc_tx_hist == NULL ? -ENOBUFS : 0;

}

module_init(packet_history_init);



static __exit void packet_history_exit(void)

void packet_history_exit(void)

{

	if (tfrc_tx_hist != NULL) {

		kmem_cache_destroy(tfrc_tx_hist);

		tfrc_tx_hist = NULL;

	}

	dccp_li_exit();

}
 
module_exit(packet_history_exit);



MODULE_AUTHOR("Ian McDonald <ian.mcdonald@jandi.co.nz>, "

	      "Arnaldo Carvalho de Melo <acme@ghostprotocols.net>");

MODULE_DESCRIPTION("DCCP TFRC library");

MODULE_LICENSE("GPL");

net/dccp/ccids/lib/packet_history.h

+1 −2
Original line number Diff line number Diff line
@@ -39,8 +39,7 @@ 
#include <linux/ktime.h>

#include <linux/list.h>

#include <linux/slab.h>



#include "../../dccp.h"

#include "tfrc.h"



/* Number of later packets received before one is considered lost */

#define TFRC_RECV_NUM_LATE_LOSS	 3

net/dccp/ccids/lib/tfrc.c

0 → 100644
+48 −0
Original line number Diff line number Diff line 
/*

 * TFRC: main module holding the pieces of the TFRC library together

 *

 * Copyright (c) 2007 The University of Aberdeen, Scotland, UK

 * Copyright (c) 2007 Arnaldo Carvalho de Melo <acme@redhat.com>

 */

#include <linux/module.h>

#include <linux/moduleparam.h>

#include "tfrc.h"



#ifdef CONFIG_IP_DCCP_TFRC_DEBUG

int tfrc_debug;

module_param(tfrc_debug, bool, 0444);

MODULE_PARM_DESC(tfrc_debug, "Enable debug messages");

#endif



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();

	}



	return rc;

}



static void __exit tfrc_module_exit(void)

{

	packet_history_exit();

	dccp_li_exit();

}



module_init(tfrc_module_init);

module_exit(tfrc_module_exit);



MODULE_AUTHOR("Gerrit Renker <gerrit@erg.abdn.ac.uk>, "

	      "Ian McDonald <ian.mcdonald@jandi.co.nz>, "

	      "Arnaldo Carvalho de Melo <acme@redhat.com>");

MODULE_DESCRIPTION("DCCP TFRC library");

MODULE_LICENSE("GPL");