diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-08 17:28:59 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-08 17:28:59 -0700 |
| commit | 0a68a20cc3eafa73bb54097c28b921147d7d3685 (patch) | |
| tree | 8e5f315226b618cb8e050a0c7653c8ec134501e3 /net/dccp/ccids/lib/loss_interval.h | |
| parent | 17dce5dfe38ae2fb359b61e855f5d8a3a8b7892b (diff) | |
| parent | a3cbdde8e9c38b66b4f13ac5d6ff1939ded0ff20 (diff) | |
Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/dccp_exp
Conflicts:
net/dccp/input.c
net/dccp/options.c
Diffstat (limited to 'net/dccp/ccids/lib/loss_interval.h')
| -rw-r--r-- | net/dccp/ccids/lib/loss_interval.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/dccp/ccids/lib/loss_interval.h b/net/dccp/ccids/lib/loss_interval.h index 246018a3b26..d08a226db43 100644 --- a/net/dccp/ccids/lib/loss_interval.h +++ b/net/dccp/ccids/lib/loss_interval.h @@ -67,9 +67,9 @@ static inline u8 tfrc_lh_length(struct tfrc_loss_hist *lh) struct tfrc_rx_hist; -extern int tfrc_lh_interval_add(struct tfrc_loss_hist *, struct tfrc_rx_hist *, +extern bool tfrc_lh_interval_add(struct tfrc_loss_hist *, struct tfrc_rx_hist *, u32 (*first_li)(struct sock *), struct sock *); -extern u8 tfrc_lh_update_i_mean(struct tfrc_loss_hist *lh, struct sk_buff *); +extern void tfrc_lh_update_i_mean(struct tfrc_loss_hist *lh, struct sk_buff *); extern void tfrc_lh_cleanup(struct tfrc_loss_hist *lh); #endif /* _DCCP_LI_HIST_ */ |