Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0740d49c authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by David S. Miller
Browse files

[DCCP] packet_history: Convert dccphtx_tstamp to ktime_t 



Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@ghostprotocols.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e7c23357

net/dccp/ccids/ccid3.c

+3 −4
Original line number Diff line number Diff line
@@ -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);



	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_rtt    = hctx->ccid3hctx_rtt;

	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_options_received *opt_recv;

	struct dccp_tx_hist_entry *packet;

	ktime_t now, t_hist;

	ktime_t now;

	unsigned long t_nfb;

	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;



		now = ktime_get_real();

		t_hist = timeval_to_ktime(packet->dccphtx_tstamp);

		/*

		 * Calculate new round trip sample as per [RFC 3448, 4.3] by

		 *	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

net/dccp/ccids/lib/packet_history.h

+1 −2
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ 
#include <linux/ktime.h>

#include <linux/list.h>

#include <linux/slab.h>

#include <linux/time.h>



#include "../../dccp.h"
@@ -58,7 +57,7 @@ struct dccp_tx_hist_entry { 
	u64		 dccphtx_seqno:48,

			 dccphtx_sent:1;

	u32		 dccphtx_rtt;

	struct timeval	 dccphtx_tstamp;

	ktime_t		 dccphtx_tstamp;

};



struct dccp_tx_hist {