Commit e7a81c6d62cbefdeb23d92ad891f429bde1c49d2
Committed by
David S. Miller
David S. Miller
1 parent
1faf0a1f5d
Exists in
master
and in
7 other branches
[DCCP]: Convert ccid3hcrx_tstamp_last_feedback to ktime_t
Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Showing 2 changed files with 12 additions and 9 deletions Side-by-side Diff
net/dccp/ccids/ccid3.c
| ... | ... | @@ -729,20 +729,21 @@ |
| 729 | 729 | struct ccid3_hc_rx_sock *hcrx = ccid3_hc_rx_sk(sk); |
| 730 | 730 | struct dccp_sock *dp = dccp_sk(sk); |
| 731 | 731 | struct dccp_rx_hist_entry *packet; |
| 732 | - struct timeval now; | |
| 732 | + struct timeval tnow; | |
| 733 | + ktime_t now; | |
| 733 | 734 | suseconds_t delta; |
| 734 | 735 | |
| 735 | 736 | ccid3_pr_debug("%s(%p) - entry \n", dccp_role(sk), sk); |
| 736 | 737 | |
| 737 | - dccp_timestamp(sk, &now); | |
| 738 | + now = ktime_get_real(); | |
| 738 | 739 | |
| 739 | 740 | switch (hcrx->ccid3hcrx_state) { |
| 740 | 741 | case TFRC_RSTATE_NO_DATA: |
| 741 | 742 | hcrx->ccid3hcrx_x_recv = 0; |
| 742 | 743 | break; |
| 743 | 744 | case TFRC_RSTATE_DATA: |
| 744 | - delta = timeval_delta(&now, | |
| 745 | - &hcrx->ccid3hcrx_tstamp_last_feedback); | |
| 745 | + delta = ktime_us_delta(now, | |
| 746 | + hcrx->ccid3hcrx_tstamp_last_feedback); | |
| 746 | 747 | DCCP_BUG_ON(delta < 0); |
| 747 | 748 | hcrx->ccid3hcrx_x_recv = |
| 748 | 749 | scaled_div32(hcrx->ccid3hcrx_bytes_recv, delta); |
| ... | ... | @@ -764,7 +765,8 @@ |
| 764 | 765 | hcrx->ccid3hcrx_bytes_recv = 0; |
| 765 | 766 | |
| 766 | 767 | /* Elapsed time information [RFC 4340, 13.2] in units of 10 * usecs */ |
| 767 | - delta = timeval_delta(&now, &packet->dccphrx_tstamp); | |
| 768 | + tnow = ktime_to_timeval(now); | |
| 769 | + delta = timeval_delta(&tnow, &packet->dccphrx_tstamp); | |
| 768 | 770 | DCCP_BUG_ON(delta < 0); |
| 769 | 771 | hcrx->ccid3hcrx_elapsed_time = delta / 10; |
| 770 | 772 | |
| 771 | 773 | |
| ... | ... | @@ -835,11 +837,13 @@ |
| 835 | 837 | |
| 836 | 838 | while (dccp_delta_seqno(hcrx->ccid3hcrx_seqno_nonloss, seqno) |
| 837 | 839 | > TFRC_RECV_NUM_LATE_LOSS) { |
| 840 | + struct timeval tstamp = | |
| 841 | + ktime_to_timeval(hcrx->ccid3hcrx_tstamp_last_feedback); | |
| 838 | 842 | loss = 1; |
| 839 | 843 | dccp_li_update_li(sk, |
| 840 | 844 | &hcrx->ccid3hcrx_li_hist, |
| 841 | 845 | &hcrx->ccid3hcrx_hist, |
| 842 | - &hcrx->ccid3hcrx_tstamp_last_feedback, | |
| 846 | + &tstamp, | |
| 843 | 847 | hcrx->ccid3hcrx_s, |
| 844 | 848 | hcrx->ccid3hcrx_bytes_recv, |
| 845 | 849 | hcrx->ccid3hcrx_x_recv, |
| 846 | 850 | |
| ... | ... | @@ -989,9 +993,8 @@ |
| 989 | 993 | hcrx->ccid3hcrx_state = TFRC_RSTATE_NO_DATA; |
| 990 | 994 | INIT_LIST_HEAD(&hcrx->ccid3hcrx_hist); |
| 991 | 995 | INIT_LIST_HEAD(&hcrx->ccid3hcrx_li_hist); |
| 992 | - hcrx->ccid3hcrx_tstamp_last_ack = ktime_get_real(); | |
| 993 | 996 | hcrx->ccid3hcrx_tstamp_last_feedback = |
| 994 | - ktime_to_timeval(hcrx->ccid3hcrx_tstamp_last_ack); | |
| 997 | + hcrx->ccid3hcrx_tstamp_last_ack = ktime_get_real(); | |
| 995 | 998 | hcrx->ccid3hcrx_s = 0; |
| 996 | 999 | hcrx->ccid3hcrx_rtt = 0; |
| 997 | 1000 | return 0; |
net/dccp/ccids/ccid3.h
| ... | ... | @@ -152,7 +152,7 @@ |
| 152 | 152 | ccid3hcrx_ccval_last_counter:4; |
| 153 | 153 | enum ccid3_hc_rx_states ccid3hcrx_state:8; |
| 154 | 154 | u32 ccid3hcrx_bytes_recv; |
| 155 | - struct timeval ccid3hcrx_tstamp_last_feedback; | |
| 155 | + ktime_t ccid3hcrx_tstamp_last_feedback; | |
| 156 | 156 | ktime_t ccid3hcrx_tstamp_last_ack; |
| 157 | 157 | struct list_head ccid3hcrx_hist; |
| 158 | 158 | struct list_head ccid3hcrx_li_hist; |