Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[DCCP] packet_history: Convert dccphtx_tstamp to ktime_t

Browse source 
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:18:13 -07:00 committed by David S. Miller
parent e7c2335794
commit 0740d49c24
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
net/dccp/ccids/ccid3.c
View file

@ -401,7 +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);
packet->dccphtx_tstamp = ktime_to_timeval(ktime_get_real()); packet->dccphtx_tstamp = ktime_get_real();
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;
@ -412,7 +412,7 @@ static void ccid3_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb)
struct ccid3_hc_tx_sock *hctx = ccid3_hc_tx_sk(sk); struct ccid3_hc_tx_sock *hctx = ccid3_hc_tx_sk(sk);
struct ccid3_options_received *opt_recv; struct ccid3_options_received *opt_recv;
struct dccp_tx_hist_entry *packet; struct dccp_tx_hist_entry *packet;
ktime_t now, t_hist; ktime_t now;
unsigned long t_nfb; unsigned long t_nfb;
u32 pinv, r_sample; u32 pinv, r_sample;
@ -451,12 +451,11 @@ static void ccid3_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb)
hctx->ccid3hctx_p = 1000000 / pinv; hctx->ccid3hctx_p = 1000000 / pinv;
now = ktime_get_real(); now = ktime_get_real();
t_hist = timeval_to_ktime(packet->dccphtx_tstamp);
/* /*
* Calculate new round trip sample as per [RFC 3448, 4.3] by * Calculate new round trip sample as per [RFC 3448, 4.3] by
* R_sample = (now - t_recvdata) - t_elapsed * R_sample = (now - t_recvdata) - t_elapsed
*/ */
r_sample = dccp_sample_rtt(sk, now, &t_hist); r_sample = dccp_sample_rtt(sk, now, &packet->dccphtx_tstamp);
/* /*
* Update RTT estimate by * Update RTT estimate by

3
net/dccp/ccids/lib/packet_history.h
View file

@ -40,7 +40,6 @@
#include <linux/ktime.h> #include <linux/ktime.h>
#include <linux/list.h> #include <linux/list.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/time.h>
#include "../../dccp.h" #include "../../dccp.h"
@ -58,7 +57,7 @@ struct dccp_tx_hist_entry {
u64 dccphtx_seqno:48, u64 dccphtx_seqno:48,
dccphtx_sent:1; dccphtx_sent:1;
u32 dccphtx_rtt; u32 dccphtx_rtt;
struct timeval dccphtx_tstamp; ktime_t dccphtx_tstamp;
}; };
struct dccp_tx_hist { struct dccp_tx_hist {