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

[DCCP] ccid3: Reorder packet history source file 



No code change at all.

This reorders the source file to follow the same order as the corresponding
header file.

Signed-off-by: default avatarGerrit Renker <gerrit@erg.abdn.ac.uk>
Acked-by: default avatarIan McDonald <ian.mcdonald@jandi.co.nz>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@mandriva.com>
parent 85dcb1f7

net/dccp/ccids/lib/packet_history.c

+112 −107
Original line number Diff line number Diff line
@@ -36,9 +36,100 @@ 


#include <linux/module.h>

#include <linux/string.h>



#include "packet_history.h"



/*

 * 	Transmitter History Routines

 */

struct dccp_tx_hist *dccp_tx_hist_new(const char *name)

{

	struct dccp_tx_hist *hist = kmalloc(sizeof(*hist), GFP_ATOMIC);

	static const char dccp_tx_hist_mask[] = "tx_hist_%s";

	char *slab_name;



	if (hist == NULL)

		goto out;



	slab_name = kmalloc(strlen(name) + sizeof(dccp_tx_hist_mask) - 1,

			    GFP_ATOMIC);

	if (slab_name == NULL)

		goto out_free_hist;



	sprintf(slab_name, dccp_tx_hist_mask, name);

	hist->dccptxh_slab = kmem_cache_create(slab_name,

					     sizeof(struct dccp_tx_hist_entry),

					       0, SLAB_HWCACHE_ALIGN,

					       NULL, NULL);

	if (hist->dccptxh_slab == NULL)

		goto out_free_slab_name;

out:

	return hist;

out_free_slab_name:

	kfree(slab_name);

out_free_hist:

	kfree(hist);

	hist = NULL;

	goto out;

}



EXPORT_SYMBOL_GPL(dccp_tx_hist_new);



void dccp_tx_hist_delete(struct dccp_tx_hist *hist)

{

	const char* name = kmem_cache_name(hist->dccptxh_slab);



	kmem_cache_destroy(hist->dccptxh_slab);

	kfree(name);

	kfree(hist);

}



EXPORT_SYMBOL_GPL(dccp_tx_hist_delete);



struct dccp_tx_hist_entry *

	dccp_tx_hist_find_entry(const struct list_head *list, const u64 seq)

{

	struct dccp_tx_hist_entry *packet = NULL, *entry;



	list_for_each_entry(entry, list, dccphtx_node)

		if (entry->dccphtx_seqno == seq) {

			packet = entry;

			break;

		}



	return packet;

}



EXPORT_SYMBOL_GPL(dccp_tx_hist_find_entry);



void dccp_tx_hist_purge(struct dccp_tx_hist *hist, struct list_head *list)

{

	struct dccp_tx_hist_entry *entry, *next;



	list_for_each_entry_safe(entry, next, list, dccphtx_node) {

		list_del_init(&entry->dccphtx_node);

		dccp_tx_hist_entry_delete(hist, entry);

	}

}



EXPORT_SYMBOL_GPL(dccp_tx_hist_purge);



void dccp_tx_hist_purge_older(struct dccp_tx_hist *hist,

			      struct list_head *list,

			      struct dccp_tx_hist_entry *packet)

{

	struct dccp_tx_hist_entry *next;



	list_for_each_entry_safe_continue(packet, next, list, dccphtx_node) {

		list_del_init(&packet->dccphtx_node);

		dccp_tx_hist_entry_delete(hist, packet);

	}

}



EXPORT_SYMBOL_GPL(dccp_tx_hist_purge_older);



/*

 * 	Receiver History Routines

 */

struct dccp_rx_hist *dccp_rx_hist_new(const char *name)

{

	struct dccp_rx_hist *hist = kmalloc(sizeof(*hist), GFP_ATOMIC);
@@ -83,18 +174,24 @@ void dccp_rx_hist_delete(struct dccp_rx_hist *hist) 


EXPORT_SYMBOL_GPL(dccp_rx_hist_delete);



void dccp_rx_hist_purge(struct dccp_rx_hist *hist, struct list_head *list)

int dccp_rx_hist_find_entry(const struct list_head *list, const u64 seq,

			    u8 *ccval)

{

	struct dccp_rx_hist_entry *entry, *next;

	struct dccp_rx_hist_entry *packet = NULL, *entry;



	list_for_each_entry_safe(entry, next, list, dccphrx_node) {

		list_del_init(&entry->dccphrx_node);

		kmem_cache_free(hist->dccprxh_slab, entry);

	}

	list_for_each_entry(entry, list, dccphrx_node)

		if (entry->dccphrx_seqno == seq) {

			packet = entry;

			break;

		}



EXPORT_SYMBOL_GPL(dccp_rx_hist_purge);

	if (packet)

		*ccval = packet->dccphrx_ccval;



	return packet != NULL;

}



EXPORT_SYMBOL_GPL(dccp_rx_hist_find_entry);

struct dccp_rx_hist_entry *

		dccp_rx_hist_find_data_packet(const struct list_head *list)

{
@@ -184,110 +281,18 @@ void dccp_rx_hist_add_packet(struct dccp_rx_hist *hist, 


EXPORT_SYMBOL_GPL(dccp_rx_hist_add_packet);



struct dccp_tx_hist *dccp_tx_hist_new(const char *name)

{

	struct dccp_tx_hist *hist = kmalloc(sizeof(*hist), GFP_ATOMIC);

	static const char dccp_tx_hist_mask[] = "tx_hist_%s";

	char *slab_name;



	if (hist == NULL)

		goto out;



	slab_name = kmalloc(strlen(name) + sizeof(dccp_tx_hist_mask) - 1,

			    GFP_ATOMIC);

	if (slab_name == NULL)

		goto out_free_hist;



	sprintf(slab_name, dccp_tx_hist_mask, name);

	hist->dccptxh_slab = kmem_cache_create(slab_name,

					     sizeof(struct dccp_tx_hist_entry),

					       0, SLAB_HWCACHE_ALIGN,

					       NULL, NULL);

	if (hist->dccptxh_slab == NULL)

		goto out_free_slab_name;

out:

	return hist;

out_free_slab_name:

	kfree(slab_name);

out_free_hist:

	kfree(hist);

	hist = NULL;

	goto out;

}



EXPORT_SYMBOL_GPL(dccp_tx_hist_new);



void dccp_tx_hist_delete(struct dccp_tx_hist *hist)

{

	const char* name = kmem_cache_name(hist->dccptxh_slab);



	kmem_cache_destroy(hist->dccptxh_slab);

	kfree(name);

	kfree(hist);

}



EXPORT_SYMBOL_GPL(dccp_tx_hist_delete);



struct dccp_tx_hist_entry *

	dccp_tx_hist_find_entry(const struct list_head *list, const u64 seq)

{

	struct dccp_tx_hist_entry *packet = NULL, *entry;



	list_for_each_entry(entry, list, dccphtx_node)

		if (entry->dccphtx_seqno == seq) {

			packet = entry;

			break;

		}



	return packet;

}



EXPORT_SYMBOL_GPL(dccp_tx_hist_find_entry);



int dccp_rx_hist_find_entry(const struct list_head *list, const u64 seq,

   u8 *ccval)

{

	struct dccp_rx_hist_entry *packet = NULL, *entry;



	list_for_each_entry(entry, list, dccphrx_node)

		if (entry->dccphrx_seqno == seq) {

			packet = entry;

			break;

		}



	if (packet)

		*ccval = packet->dccphrx_ccval;



	return packet != NULL;

}



EXPORT_SYMBOL_GPL(dccp_rx_hist_find_entry);



void dccp_tx_hist_purge_older(struct dccp_tx_hist *hist,

			      struct list_head *list,

			      struct dccp_tx_hist_entry *packet)

void dccp_rx_hist_purge(struct dccp_rx_hist *hist, struct list_head *list)

{

	struct dccp_tx_hist_entry *next;

	struct dccp_rx_hist_entry *entry, *next;



	list_for_each_entry_safe_continue(packet, next, list, dccphtx_node) {

		list_del_init(&packet->dccphtx_node);

		dccp_tx_hist_entry_delete(hist, packet);

	list_for_each_entry_safe(entry, next, list, dccphrx_node) {

		list_del_init(&entry->dccphrx_node);

		kmem_cache_free(hist->dccprxh_slab, entry);

	}

}



EXPORT_SYMBOL_GPL(dccp_tx_hist_purge_older);



void dccp_tx_hist_purge(struct dccp_tx_hist *hist, struct list_head *list)

{

	struct dccp_tx_hist_entry *entry, *next;



	list_for_each_entry_safe(entry, next, list, dccphtx_node) {

		list_del_init(&entry->dccphtx_node);

		dccp_tx_hist_entry_delete(hist, entry);

	}

}

EXPORT_SYMBOL_GPL(dccp_rx_hist_purge);



EXPORT_SYMBOL_GPL(dccp_tx_hist_purge);



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

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