leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[DCCP] CCID2: Fix jiffie wrap issues

Browse Source 
Jiffies are now handled correctly (I hope) in CCID2.  If they wrap, no
problem.

Signed-off-by: Andrea Bittau <a.bittau@cs.ucl.ac.uk>
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Andrea Bittau 2006-09-19 13:06:46 -07:00 committed by David S. Miller
parent 4a0a50fb43
commit 29651cda97
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/dccp/ccids/ccid2.c
View File

@ -27,7 +27,6 @@
*
* BUGS:
* - sequence number wrapping
* - jiffies wrapping
*/
#include "../ccid.h"
@ -71,7 +70,8 @@ static void ccid2_hc_tx_check_sanity(const struct ccid2_hc_tx_sock *hctx)
/* packets are sent sequentially */
BUG_ON(seqp->ccid2s_seq <= prev->ccid2s_seq);
BUG_ON(seqp->ccid2s_sent < prev->ccid2s_sent);
BUG_ON(time_before(seqp->ccid2s_sent,
prev->ccid2s_sent));
BUG_ON(len > ccid2_seq_len);
seqp = prev;
@ -418,8 +418,8 @@ static inline void ccid2_new_ack(struct sock *sk,
/* update RTO */
if (hctx->ccid2hctx_srtt == -1 ||
(jiffies - hctx->ccid2hctx_lastrtt) >= hctx->ccid2hctx_srtt) {
unsigned long r = jiffies - seqp->ccid2s_sent;
time_after(jiffies, hctx->ccid2hctx_lastrtt + hctx->ccid2hctx_srtt)) {
unsigned long r = (long)jiffies - (long)seqp->ccid2s_sent;
int s;
/* first measurement */