diff options
| author | Arnaldo Carvalho de Melo <acme@ghostprotocols.net> | 2007-08-19 17:17:02 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 16:48:13 -0700 |
| commit | 668348a4232d3dd0ee48b3dc13228b5a7eb57565 (patch) | |
| tree | 901c41d72c9202a503333acf854d761cb6121e6e /net/dccp | |
| parent | 9823b7b5542858afe5b6a1e2df83b3847c28f3d6 (diff) | |
| download | linux-3.10-668348a4232d3dd0ee48b3dc13228b5a7eb57565.tar.gz linux-3.10-668348a4232d3dd0ee48b3dc13228b5a7eb57565.tar.bz2 linux-3.10-668348a4232d3dd0ee48b3dc13228b5a7eb57565.zip | |
[DCCP] CCID3: Stop using dccp_timestamp
Now to convert the ackvec code to ktime_t so that we can get rid of
dccp_timestamp and the epoch thing in dccp_sock.
Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp')
| -rw-r--r-- | net/dccp/ccids/ccid3.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/net/dccp/ccids/ccid3.c b/net/dccp/ccids/ccid3.c index 3524328db0b..6b12e9faef3 100644 --- a/net/dccp/ccids/ccid3.c +++ b/net/dccp/ccids/ccid3.c @@ -388,7 +388,6 @@ static void ccid3_hc_tx_packet_sent(struct sock *sk, int more, unsigned int len) { struct ccid3_hc_tx_sock *hctx = ccid3_hc_tx_sk(sk); - struct timeval now; struct dccp_tx_hist_entry *packet; BUG_ON(hctx == NULL); @@ -402,8 +401,7 @@ static void ccid3_hc_tx_packet_sent(struct sock *sk, int more, } dccp_tx_hist_add_entry(&hctx->ccid3hctx_hist, packet); - dccp_timestamp(sk, &now); - packet->dccphtx_tstamp = now; + packet->dccphtx_tstamp = ktime_to_timeval(ktime_get_real()); packet->dccphtx_seqno = dccp_sk(sk)->dccps_gss; packet->dccphtx_rtt = hctx->ccid3hctx_rtt; packet->dccphtx_sent = 1; @@ -729,8 +727,7 @@ static void ccid3_hc_rx_send_feedback(struct sock *sk) struct ccid3_hc_rx_sock *hcrx = ccid3_hc_rx_sk(sk); struct dccp_sock *dp = dccp_sk(sk); struct dccp_rx_hist_entry *packet; - struct timeval tnow; - ktime_t now; + ktime_t now, t_hist; suseconds_t delta; ccid3_pr_debug("%s(%p) - entry \n", dccp_role(sk), sk); @@ -765,8 +762,8 @@ static void ccid3_hc_rx_send_feedback(struct sock *sk) hcrx->ccid3hcrx_bytes_recv = 0; /* Elapsed time information [RFC 4340, 13.2] in units of 10 * usecs */ - tnow = ktime_to_timeval(now); - delta = timeval_delta(&tnow, &packet->dccphrx_tstamp); + t_hist = timeval_to_ktime(packet->dccphrx_tstamp); + delta = ktime_us_delta(now, t_hist); DCCP_BUG_ON(delta < 0); hcrx->ccid3hcrx_elapsed_time = delta / 10; |