: Reorder packet history header file
PATCH 11/12 : Reorder packet history header file
[CCID3]: Reorder packet history header file
No code change at all.
To make the header file easier to read, the following ordering is established among the declarations:
* hist_new
* hist_delete
* hist_entry_new
* hist_head
* hist_find_entry
* hist_add_entry
* hist_entry_delete
* hist_purge
Signed-off-by Gerrit Renker <[email protected]>
--- net/dccp/ccids/lib/packet_history.h | 128 +++++++++++++++++++----------------- 1 file changed, 68 insertions(+), 60 deletions(-)
net/dccp/ccids/lib/packet_history.h +68 -60
@@ -49,6 +49,10 @@#define TFRC_WIN_COUNT_PER_RTT 4#define TFRC_WIN_COUNT_LIMIT 16 + +/* +* Transmitter History data structures and declarations +*/ struct dccp_tx_hist_entry {struct list_head dccphtx_node; u64 dccphtx_seqno:48,
@@ -57,34 +61,16 @@ struct dccp_tx_hist_entry {struct timeval dccphtx_tstamp; }; -struct dccp_rx_hist_entry { -struct list_head dccphrx_node; -u64 dccphrx_seqno:48 , - dccphrx_ccval:4 , - dccphrx_type:4 ; -u32 dccphrx_ndp;/* In fact it is from 8 to 24 bits */ -struct timeval dccphrx_tstamp; -}; -struct dccp_tx_hist {kmem_cache_t *dccptxh_slab; };extern struct dccp_tx_hist *dccp_tx_hist_new (const char *name); -extern void dccp_tx_hist_delete (struct dccp_tx_hist *hist); - -struct dccp_rx_hist { -kmem_cache_t *dccprxh_slab; -}; - -extern struct dccp_rx_hist *dccp_rx_hist_new (const char *name); -extern void dccp_rx_hist_delete (struct dccp_rx_hist *hist); -extern struct dccp_rx_hist_entry * -dccp_rx_hist_find_data_packet (const struct list_head *list); +extern void dccp_tx_hist_delete (struct dccp_tx_hist *hist);static inline struct dccp_tx_hist_entry * -dccp_tx_hist_entry_new (struct dccp_tx_hist *hist, -const gfp_t prio) +dccp_tx_hist_entry_new (struct dccp_tx_hist *hist, +const gfp_t prio) {struct dccp_tx_hist_entry *entry =kmem_cache_alloc (hist->dccptxh_slab, prio);
@@ -95,18 +81,20 @@ static inline struct dccp_tx_hist_entryreturn entry; } -static inline void dccp_tx_hist_entry_delete (struct dccp_tx_hist *hist, -struct dccp_tx_hist_entry *entry) +static inline struct dccp_tx_hist_entry * +dccp_tx_hist_head (struct list_head *list) { -if (entry !=NULL ) -kmem_cache_free (hist->dccptxh_slab, entry); +struct dccp_tx_hist_entry *head =NULL ; + +if (!list_empty (list)) + head = list_entry(list->next, struct dccp_tx_hist_entry, + dccphtx_node); +return head; }extern struct dccp_tx_hist_entry *dccp_tx_hist_find_entry (const struct list_head *list,const u64 seq); -extern int dccp_rx_hist_find_entry (const struct list_head *list,const u64 seq, -u8 *ccval);static inline void dccp_tx_hist_add_entry (struct list_head *list,struct dccp_tx_hist_entry *entry)
@@ -114,30 +102,45 @@ static inline void dccp_tx_hist_add_entrlist_add (&entry->dccphtx_node, list); } +static inline void dccp_tx_hist_entry_delete (struct dccp_tx_hist *hist, +struct dccp_tx_hist_entry *entry) +{ +if (entry !=NULL ) +kmem_cache_free (hist->dccptxh_slab, entry); +} + +extern void dccp_tx_hist_purge (struct dccp_tx_hist *hist, +struct list_head *list); +extern void dccp_tx_hist_purge_older (struct dccp_tx_hist *hist,struct list_head *list,struct dccp_tx_hist_entry *next); -extern void dccp_tx_hist_purge (struct dccp_tx_hist *hist, -struct list_head *list); +/* +* Receiver History data structures and declarations +*/ +struct dccp_rx_hist_entry { +struct list_head dccphrx_node; +u64 dccphrx_seqno:48 , + dccphrx_ccval:4 , + dccphrx_type:4 ; +u32 dccphrx_ndp;/* In fact it is from 8 to 24 bits */ +struct timeval dccphrx_tstamp; +}; -static inline struct dccp_tx_hist_entry * -dccp_tx_hist_head (struct list_head *list) -{ -struct dccp_tx_hist_entry *head =NULL ; +struct dccp_rx_hist { +kmem_cache_t *dccprxh_slab; +}; -if (!list_empty (list)) - head = list_entry(list->next, struct dccp_tx_hist_entry, - dccphtx_node); -return head; -} +extern struct dccp_rx_hist *dccp_rx_hist_new (const char *name); +extern void dccp_rx_hist_delete (struct dccp_rx_hist *hist);static inline struct dccp_rx_hist_entry * -dccp_rx_hist_entry_new (struct dccp_rx_hist *hist, -const struct sock *sk, -const u32 ndp, -const struct sk_buff *skb, -const gfp_t prio) +dccp_rx_hist_entry_new (struct dccp_rx_hist *hist, +const struct sock *sk, +const u32 ndp, +const struct sk_buff *skb, +const gfp_t prio) {struct dccp_rx_hist_entry *entry =kmem_cache_alloc (hist->dccprxh_slab, prio);
@@ -155,18 +158,8 @@ static inline struct dccp_rx_hist_entryreturn entry; } -static inline void dccp_rx_hist_entry_delete (struct dccp_rx_hist *hist, -struct dccp_rx_hist_entry *entry) -{ -if (entry !=NULL ) -kmem_cache_free (hist->dccprxh_slab, entry); -} - -extern void dccp_rx_hist_purge (struct dccp_rx_hist *hist, -struct list_head *list); -static inline struct dccp_rx_hist_entry * -dccp_rx_hist_head (struct list_head *list) +dccp_rx_hist_head (struct list_head *list) {struct dccp_rx_hist_entry *head =NULL ;
@@ -176,6 +169,27 @@ static inline struct dccp_rx_hist_entryreturn head; } +extern int dccp_rx_hist_find_entry (const struct list_head *list,const u64 seq, +u8 *ccval); +extern struct dccp_rx_hist_entry * +dccp_rx_hist_find_data_packet (const struct list_head *list); + +extern void dccp_rx_hist_add_packet (struct dccp_rx_hist *hist, +struct list_head *rx_list, +struct list_head *li_list, +struct dccp_rx_hist_entry *packet, +u64 nonloss_seqno); + +static inline void dccp_rx_hist_entry_delete (struct dccp_rx_hist *hist, +struct dccp_rx_hist_entry *entry) +{ +if (entry !=NULL ) +kmem_cache_free (hist->dccprxh_slab, entry); +} + +extern void dccp_rx_hist_purge (struct dccp_rx_hist *hist, +struct list_head *list); +static inline int dccp_rx_hist_entry_data_packet (const struct dccp_rx_hist_entry *entry) {
@@ -183,12 +197,6 @@ static inline int entry->dccphrx_type =DCCP_PKT_DATAACK ; } -extern void dccp_rx_hist_add_packet (struct dccp_rx_hist *hist, -struct list_head *rx_list, -struct list_head *li_list, -struct dccp_rx_hist_entry *packet, -u64 nonloss_seqno); -extern u64 dccp_rx_hist_detect_loss (struct list_head *rx_list,struct list_head *li_list,u8 *win_loss);
Quoted 2 lines · Gerrit Renker
[CCID3]: Reorder packet history header file
Acked-by Ian McDonald <[email protected]>
Signature · 3 lines
Web: http://wand.net.nz/~iam4 Blog: http://imcdnzl.blogspot.com WAND Network Research Group