openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[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>
This commit is contained in:
Arnaldo Carvalho de Melo 2007-08-19 17:17:02 -07:00 committed by David S. Miller
parent 9823b7b554
commit 668348a423
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
net/dccp/ccids/ccid3.c
View File

@ -388,7 +388,6 @@ static void ccid3_hc_tx_packet_sent(struct sock *sk, int more,
unsigned int len) unsigned int len)
{ {
struct ccid3_hc_tx_sock *hctx = ccid3_hc_tx_sk(sk); struct ccid3_hc_tx_sock *hctx = ccid3_hc_tx_sk(sk);
struct timeval now;
struct dccp_tx_hist_entry *packet; struct dccp_tx_hist_entry *packet;
BUG_ON(hctx == NULL); 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_tx_hist_add_entry(&hctx->ccid3hctx_hist, packet);
dccp_timestamp(sk, &now); packet->dccphtx_tstamp = ktime_to_timeval(ktime_get_real());
packet->dccphtx_tstamp = now;
packet->dccphtx_seqno = dccp_sk(sk)->dccps_gss; packet->dccphtx_seqno = dccp_sk(sk)->dccps_gss;
packet->dccphtx_rtt = hctx->ccid3hctx_rtt; packet->dccphtx_rtt = hctx->ccid3hctx_rtt;
packet->dccphtx_sent = 1; 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 ccid3_hc_rx_sock *hcrx = ccid3_hc_rx_sk(sk);
struct dccp_sock *dp = dccp_sk(sk); struct dccp_sock *dp = dccp_sk(sk);
struct dccp_rx_hist_entry *packet; struct dccp_rx_hist_entry *packet;
struct timeval tnow; ktime_t now, t_hist;
ktime_t now;
suseconds_t delta; suseconds_t delta;
ccid3_pr_debug("%s(%p) - entry \n", dccp_role(sk), sk); 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; hcrx->ccid3hcrx_bytes_recv = 0;
/* Elapsed time information [RFC 4340, 13.2] in units of 10 * usecs */ /* Elapsed time information [RFC 4340, 13.2] in units of 10 * usecs */
tnow = ktime_to_timeval(now); t_hist = timeval_to_ktime(packet->dccphrx_tstamp);
delta = timeval_delta(&tnow, &packet->dccphrx_tstamp); delta = ktime_us_delta(now, t_hist);
DCCP_BUG_ON(delta < 0); DCCP_BUG_ON(delta < 0);
hcrx->ccid3hcrx_elapsed_time = delta / 10; hcrx->ccid3hcrx_elapsed_time = delta / 10;