[CCID3] Use ELAPSED_TIME in the HC TX RTT estimation

Signed-off-by: NArnaldo Carvalho de Melo <acme@mandriva.com>
上级 1c14ac0a
...@@ -483,7 +483,7 @@ static void ccid3_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb) ...@@ -483,7 +483,7 @@ static void ccid3_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb)
opt_recv = &hctx->ccid3hctx_options_received; opt_recv = &hctx->ccid3hctx_options_received;
t_elapsed = dp->dccps_options_received.dccpor_elapsed_time; t_elapsed = dp->dccps_options_received.dccpor_elapsed_time * 10;
x_recv = opt_recv->ccid3or_receive_rate; x_recv = opt_recv->ccid3or_receive_rate;
pinv = opt_recv->ccid3or_loss_event_rate; pinv = opt_recv->ccid3or_loss_event_rate;
...@@ -509,8 +509,12 @@ static void ccid3_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb) ...@@ -509,8 +509,12 @@ static void ccid3_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb)
/* Update RTT */ /* Update RTT */
r_sample = timeval_now_delta(&packet->dccphtx_tstamp); r_sample = timeval_now_delta(&packet->dccphtx_tstamp);
/* FIXME: */ if (unlikely(r_sample <= t_elapsed))
// r_sample -= usecs_to_jiffies(t_elapsed * 10); LIMIT_NETDEBUG(KERN_WARNING
"%s: r_sample=%uus, t_elapsed=%uus\n",
__FUNCTION__, r_sample, t_elapsed);
else
r_sample -= t_elapsed;
/* Update RTT estimate by /* Update RTT estimate by
* If (No feedback recv) * If (No feedback recv)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册