diff options
Diffstat (limited to 'net/dccp/ccids/ccid3.c')
-rw-r--r-- | net/dccp/ccids/ccid3.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/net/dccp/ccids/ccid3.c b/net/dccp/ccids/ccid3.c index 145aafafe4e2..348e6fb262c3 100644 --- a/net/dccp/ccids/ccid3.c +++ b/net/dccp/ccids/ccid3.c | |||
@@ -169,7 +169,7 @@ static void ccid3_hc_tx_update_x(struct sock *sk) | |||
169 | } else { | 169 | } else { |
170 | struct timeval now; | 170 | struct timeval now; |
171 | 171 | ||
172 | do_gettimeofday(&now); | 172 | dccp_timestamp(sk, &now); |
173 | if (timeval_delta(&now, &hctx->ccid3hctx_t_ld) >= | 173 | if (timeval_delta(&now, &hctx->ccid3hctx_t_ld) >= |
174 | hctx->ccid3hctx_rtt) { | 174 | hctx->ccid3hctx_rtt) { |
175 | hctx->ccid3hctx_x = max_t(u32, min_t(u32, hctx->ccid3hctx_x_recv, | 175 | hctx->ccid3hctx_x = max_t(u32, min_t(u32, hctx->ccid3hctx_x_recv, |
@@ -317,7 +317,7 @@ static int ccid3_hc_tx_send_packet(struct sock *sk, | |||
317 | dccp_tx_hist_add_entry(&hctx->ccid3hctx_hist, new_packet); | 317 | dccp_tx_hist_add_entry(&hctx->ccid3hctx_hist, new_packet); |
318 | } | 318 | } |
319 | 319 | ||
320 | do_gettimeofday(&now); | 320 | dccp_timestamp(sk, &now); |
321 | 321 | ||
322 | switch (hctx->ccid3hctx_state) { | 322 | switch (hctx->ccid3hctx_state) { |
323 | case TFRC_SSTATE_NO_SENT: | 323 | case TFRC_SSTATE_NO_SENT: |
@@ -382,7 +382,7 @@ static void ccid3_hc_tx_packet_sent(struct sock *sk, int more, int len) | |||
382 | return; | 382 | return; |
383 | } | 383 | } |
384 | 384 | ||
385 | do_gettimeofday(&now); | 385 | dccp_timestamp(sk, &now); |
386 | 386 | ||
387 | /* check if we have sent a data packet */ | 387 | /* check if we have sent a data packet */ |
388 | if (len > 0) { | 388 | if (len > 0) { |
@@ -461,6 +461,7 @@ static void ccid3_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb) | |||
461 | struct ccid3_hc_tx_sock *hctx = dp->dccps_hc_tx_ccid_private; | 461 | struct ccid3_hc_tx_sock *hctx = dp->dccps_hc_tx_ccid_private; |
462 | struct ccid3_options_received *opt_recv; | 462 | struct ccid3_options_received *opt_recv; |
463 | struct dccp_tx_hist_entry *packet; | 463 | struct dccp_tx_hist_entry *packet; |
464 | struct timeval now; | ||
464 | unsigned long next_tmout; | 465 | unsigned long next_tmout; |
465 | u32 t_elapsed; | 466 | u32 t_elapsed; |
466 | u32 pinv; | 467 | u32 pinv; |
@@ -508,7 +509,8 @@ static void ccid3_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb) | |||
508 | } | 509 | } |
509 | 510 | ||
510 | /* Update RTT */ | 511 | /* Update RTT */ |
511 | r_sample = timeval_now_delta(&packet->dccphtx_tstamp); | 512 | dccp_timestamp(sk, &now); |
513 | r_sample = timeval_delta(&now, &packet->dccphtx_tstamp); | ||
512 | if (unlikely(r_sample <= t_elapsed)) | 514 | if (unlikely(r_sample <= t_elapsed)) |
513 | LIMIT_NETDEBUG(KERN_WARNING | 515 | LIMIT_NETDEBUG(KERN_WARNING |
514 | "%s: r_sample=%uus, t_elapsed=%uus\n", | 516 | "%s: r_sample=%uus, t_elapsed=%uus\n", |
@@ -774,7 +776,7 @@ static void ccid3_hc_rx_send_feedback(struct sock *sk) | |||
774 | 776 | ||
775 | ccid3_pr_debug("%s, sk=%p\n", dccp_role(sk), sk); | 777 | ccid3_pr_debug("%s, sk=%p\n", dccp_role(sk), sk); |
776 | 778 | ||
777 | do_gettimeofday(&now); | 779 | dccp_timestamp(sk, &now); |
778 | 780 | ||
779 | switch (hcrx->ccid3hcrx_state) { | 781 | switch (hcrx->ccid3hcrx_state) { |
780 | case TFRC_RSTATE_NO_DATA: | 782 | case TFRC_RSTATE_NO_DATA: |
@@ -903,10 +905,9 @@ found: | |||
903 | if (rtt == 0) | 905 | if (rtt == 0) |
904 | rtt = 1; | 906 | rtt = 1; |
905 | 907 | ||
906 | delta = timeval_now_delta(&hcrx->ccid3hcrx_tstamp_last_feedback); | 908 | dccp_timestamp(sk, &tstamp); |
907 | x_recv = hcrx->ccid3hcrx_bytes_recv * USEC_PER_SEC; | 909 | delta = timeval_delta(&tstamp, &hcrx->ccid3hcrx_tstamp_last_feedback); |
908 | if (likely(delta > 1)) | 910 | x_recv = usecs_div(hcrx->ccid3hcrx_bytes_recv, delta); |
909 | x_recv /= delta; | ||
910 | 911 | ||
911 | tmp1 = (u64)x_recv * (u64)rtt; | 912 | tmp1 = (u64)x_recv * (u64)rtt; |
912 | do_div(tmp1,10000000); | 913 | do_div(tmp1,10000000); |
@@ -981,7 +982,7 @@ static void ccid3_hc_rx_packet_recv(struct sock *sk, struct sk_buff *skb) | |||
981 | if (opt_recv->dccpor_timestamp_echo == 0) | 982 | if (opt_recv->dccpor_timestamp_echo == 0) |
982 | break; | 983 | break; |
983 | p_prev = hcrx->ccid3hcrx_rtt; | 984 | p_prev = hcrx->ccid3hcrx_rtt; |
984 | do_gettimeofday(&now); | 985 | dccp_timestamp(sk, &now); |
985 | timeval_sub_usecs(&now, opt_recv->dccpor_timestamp_echo * 10); | 986 | timeval_sub_usecs(&now, opt_recv->dccpor_timestamp_echo * 10); |
986 | r_sample = timeval_usecs(&now); | 987 | r_sample = timeval_usecs(&now); |
987 | t_elapsed = opt_recv->dccpor_elapsed_time * 10; | 988 | t_elapsed = opt_recv->dccpor_elapsed_time * 10; |
@@ -1013,7 +1014,7 @@ static void ccid3_hc_rx_packet_recv(struct sock *sk, struct sk_buff *skb) | |||
1013 | return; | 1014 | return; |
1014 | } | 1015 | } |
1015 | 1016 | ||
1016 | packet = dccp_rx_hist_entry_new(ccid3_rx_hist, opt_recv->dccpor_ndp, | 1017 | packet = dccp_rx_hist_entry_new(ccid3_rx_hist, sk, opt_recv->dccpor_ndp, |
1017 | skb, SLAB_ATOMIC); | 1018 | skb, SLAB_ATOMIC); |
1018 | if (packet == NULL) { | 1019 | if (packet == NULL) { |
1019 | ccid3_pr_debug("%s, sk=%p, Not enough mem to add rx packet " | 1020 | ccid3_pr_debug("%s, sk=%p, Not enough mem to add rx packet " |
@@ -1045,7 +1046,7 @@ static void ccid3_hc_rx_packet_recv(struct sock *sk, struct sk_buff *skb) | |||
1045 | if (ins != 0) | 1046 | if (ins != 0) |
1046 | break; | 1047 | break; |
1047 | 1048 | ||
1048 | do_gettimeofday(&now); | 1049 | dccp_timestamp(sk, &now); |
1049 | if (timeval_delta(&now, &hcrx->ccid3hcrx_tstamp_last_ack) >= | 1050 | if (timeval_delta(&now, &hcrx->ccid3hcrx_tstamp_last_ack) >= |
1050 | hcrx->ccid3hcrx_rtt) { | 1051 | hcrx->ccid3hcrx_rtt) { |
1051 | hcrx->ccid3hcrx_tstamp_last_ack = now; | 1052 | hcrx->ccid3hcrx_tstamp_last_ack = now; |
@@ -1100,7 +1101,7 @@ static int ccid3_hc_rx_init(struct sock *sk) | |||
1100 | hcrx->ccid3hcrx_state = TFRC_RSTATE_NO_DATA; | 1101 | hcrx->ccid3hcrx_state = TFRC_RSTATE_NO_DATA; |
1101 | INIT_LIST_HEAD(&hcrx->ccid3hcrx_hist); | 1102 | INIT_LIST_HEAD(&hcrx->ccid3hcrx_hist); |
1102 | INIT_LIST_HEAD(&hcrx->ccid3hcrx_li_hist); | 1103 | INIT_LIST_HEAD(&hcrx->ccid3hcrx_li_hist); |
1103 | do_gettimeofday(&hcrx->ccid3hcrx_tstamp_last_ack); | 1104 | dccp_timestamp(sk, &hcrx->ccid3hcrx_tstamp_last_ack); |
1104 | hcrx->ccid3hcrx_tstamp_last_feedback = hcrx->ccid3hcrx_tstamp_last_ack; | 1105 | hcrx->ccid3hcrx_tstamp_last_feedback = hcrx->ccid3hcrx_tstamp_last_ack; |
1105 | hcrx->ccid3hcrx_rtt = 5000; /* XXX 5ms for now... */ | 1106 | hcrx->ccid3hcrx_rtt = 5000; /* XXX 5ms for now... */ |
1106 | return 0; | 1107 | return 0; |