: [DCCP] CCID2: Fix jiffie wrap issues
PATCH 4/10 : [DCCP] CCID2: Fix jiffie wrap issues
Jiffies are now handled correctly (I hope) in CCID2. If they wrap, no problem.
Signed-off-by Andrea Bittau <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
------------------------------------------------------------------------------
ccid2.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
------------------------------------------------------------------------------
net/dccp/ccids/ccid2.c +4 -4
@@ -27,7 +27,6 @@* * BUGS: * - sequence number wrapping -* - jiffies wrapping */ #include "../ccid.h"
@@ -71,7 +70,8 @@ static void ccid2_hc_tx_check_sanity(con/* 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/* 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 */
From: Arnaldo Carvalho de Melo <[email protected]>
Date: Thu, 14 Sep 2006 14:10:00 -0300
Quoted 4 lines
Jiffies are now handled correctly (I hope) in CCID2. If they wrap, no problem.
Signed-off-by Andrea Bittau <[email protected]>Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
Applied.