aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@mandriva.com>2005-09-09 01:32:56 -0400
committerArnaldo Carvalho de Melo <acme@mandriva.com>2005-09-09 01:32:56 -0400
commit1a28599a2c2781dd6af72f4f84175e2db74d3bb1 (patch)
tree1cbb3911a234da8722bbd87445ca5b623d9328c8
parent1c14ac0ae8eb62cbb40af1e31b156994c7d7d3d5 (diff)
[CCID3] Use ELAPSED_TIME in the HC TX RTT estimation
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
-rw-r--r--net/dccp/ccids/ccid3.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/net/dccp/ccids/ccid3.c b/net/dccp/ccids/ccid3.c
index 63f897394a1e..86c109e2f2cd 100644
--- a/net/dccp/ccids/ccid3.c
+++ b/net/dccp/ccids/ccid3.c
@@ -483,7 +483,7 @@ static void ccid3_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb)
483 483
484 opt_recv = &hctx->ccid3hctx_options_received; 484 opt_recv = &hctx->ccid3hctx_options_received;
485 485
486 t_elapsed = dp->dccps_options_received.dccpor_elapsed_time; 486 t_elapsed = dp->dccps_options_received.dccpor_elapsed_time * 10;
487 x_recv = opt_recv->ccid3or_receive_rate; 487 x_recv = opt_recv->ccid3or_receive_rate;
488 pinv = opt_recv->ccid3or_loss_event_rate; 488 pinv = opt_recv->ccid3or_loss_event_rate;
489 489
@@ -509,8 +509,12 @@ static void ccid3_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb)
509 509
510 /* Update RTT */ 510 /* Update RTT */
511 r_sample = timeval_now_delta(&packet->dccphtx_tstamp); 511 r_sample = timeval_now_delta(&packet->dccphtx_tstamp);
512 /* FIXME: */ 512 if (unlikely(r_sample <= t_elapsed))
513 // r_sample -= usecs_to_jiffies(t_elapsed * 10); 513 LIMIT_NETDEBUG(KERN_WARNING
514 "%s: r_sample=%uus, t_elapsed=%uus\n",
515 __FUNCTION__, r_sample, t_elapsed);
516 else
517 r_sample -= t_elapsed;
514 518
515 /* Update RTT estimate by 519 /* Update RTT estimate by
516 * If (No feedback recv) 520 * If (No feedback recv)