git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
net
/
dccp
/
ccids
/
lib
/
packet_history.h
diff --git
a/net/dccp/ccids/lib/packet_history.h
b/net/dccp/ccids/lib/packet_history.h
index
067cf1c
..
122e967
100644
(file)
--- a/
net/dccp/ccids/lib/packet_history.h
+++ b/
net/dccp/ccids/lib/packet_history.h
@@
-1,13
+1,13
@@
/*
* net/dccp/packet_history.h
*
/*
* net/dccp/packet_history.h
*
- * Copyright (c) 2005
-6
The University of Waikato, Hamilton, New Zealand.
+ * Copyright (c) 2005 The University of Waikato, Hamilton, New Zealand.
*
* An implementation of the DCCP protocol
*
* This code has been developed by the University of Waikato WAND
* research group. For further information please see http://www.wand.net.nz/
*
* An implementation of the DCCP protocol
*
* This code has been developed by the University of Waikato WAND
* research group. For further information please see http://www.wand.net.nz/
- * or e-mail Ian McDonald - ia
n.mcdonald@jandi.co
.nz
+ * or e-mail Ian McDonald - ia
m4@cs.waikato.ac
.nz
*
* This code also uses code from Lulea University, rereleased as GPL by its
* authors:
*
* This code also uses code from Lulea University, rereleased as GPL by its
* authors:
@@
-37,6
+37,7
@@
#ifndef _DCCP_PKT_HIST_
#define _DCCP_PKT_HIST_
#ifndef _DCCP_PKT_HIST_
#define _DCCP_PKT_HIST_
+#include <linux/config.h>
#include <linux/list.h>
#include <linux/slab.h>
#include <linux/time.h>
#include <linux/list.h>
#include <linux/slab.h>
#include <linux/time.h>
@@
-106,8
+107,6
@@
static inline void dccp_tx_hist_entry_delete(struct dccp_tx_hist *hist,
extern struct dccp_tx_hist_entry *
dccp_tx_hist_find_entry(const struct list_head *list,
const u64 seq);
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)
static inline void dccp_tx_hist_add_entry(struct list_head *list,
struct dccp_tx_hist_entry *entry)
@@
-166,6
+165,12
@@
static inline void dccp_rx_hist_entry_delete(struct dccp_rx_hist *hist,
extern void dccp_rx_hist_purge(struct dccp_rx_hist *hist,
struct list_head *list);
extern void dccp_rx_hist_purge(struct dccp_rx_hist *hist,
struct list_head *list);
+static inline void dccp_rx_hist_add_entry(struct list_head *list,
+ struct dccp_rx_hist_entry *entry)
+{
+ list_add(&entry->dccphrx_node, list);
+}
+
static inline struct dccp_rx_hist_entry *
dccp_rx_hist_head(struct list_head *list)
{
static inline struct dccp_rx_hist_entry *
dccp_rx_hist_head(struct list_head *list)
{
@@
-184,11
+189,10
@@
static inline int
entry->dccphrx_type == DCCP_PKT_DATAACK;
}
entry->dccphrx_type == DCCP_PKT_DATAACK;
}
-extern
void
dccp_rx_hist_add_packet(struct dccp_rx_hist *hist,
+extern
int
dccp_rx_hist_add_packet(struct dccp_rx_hist *hist,
struct list_head *rx_list,
struct list_head *li_list,
struct list_head *rx_list,
struct list_head *li_list,
- struct dccp_rx_hist_entry *packet,
- u64 nonloss_seqno);
+ struct dccp_rx_hist_entry *packet);
extern u64 dccp_rx_hist_detect_loss(struct list_head *rx_list,
struct list_head *li_list, u8 *win_loss);
extern u64 dccp_rx_hist_detect_loss(struct list_head *rx_list,
struct list_head *li_list, u8 *win_loss);