: Fix bug in computing elapsed time

@@ -43,6 +43,8 @@ struct ccid_operations {
 						    unsigned char* value);
 	int		(*ccid_hc_rx_insert_options)(struct sock *sk,
 						     struct sk_buff *skb);
+	int		(*ccid_hc_tx_insert_options)(struct sock *sk,
+						     struct sk_buff *skb);
 	void		(*ccid_hc_tx_packet_recv)(struct sock *sk,
 						  struct sk_buff *skb);
 	int		(*ccid_hc_tx_parse_options)(struct sock *sk,

@@ -152,6 +154,14 @@ static inline int ccid_hc_rx_insert_opti
 	return 0;
 }
 
+static inline int ccid_hc_tx_insert_options(struct ccid *ccid, struct sock *sk,
+					    struct sk_buff *skb)
+{
+	if (ccid->ccid_ops->ccid_hc_tx_insert_options != NULL)
+		return ccid->ccid_ops->ccid_hc_tx_insert_options(sk, skb);
+	return 0;
+}
+
 static inline void ccid_hc_rx_get_info(struct ccid *ccid, struct sock *sk,
 				       struct tcp_info *info)
 {

@@ -615,6 +615,23 @@ static int ccid3_hc_tx_parse_options(str
 	return rc;
 }
 
+static int ccid3_hc_tx_insert_options(struct sock *sk, struct sk_buff *skb)
+{
+	if (!(sk->sk_state = DCCP_OPEN || sk->sk_state = DCCP_PARTOPEN))
+		return 0;
+
+	/*
+	 * Timestamp as required by RFC 3448, 3.2.1
+	 * The receiver will reply with a Timestamp Echo option (RFC 4340, 13.1)
+	 * so that RFC 4340, 6. is also satisfied. In addition, we get a much
+	 * better estimate of the receiver processing time: since receive time-
+	 * stamps are taken in the CCID3 module, the elapsed time never amounts
+	 * to more than mere function processing time - which is negligible in
+	 * comparison to genuine layer-processing delays.
+	 */
+	return dccp_insert_option_timestamp(sk, skb);
+}
+
 static int ccid3_hc_tx_init(struct ccid *ccid, struct sock *sk)
 {
 	struct ccid3_hc_tx_sock *hctx = ccid_priv(ccid);

@@ -747,7 +764,7 @@ static void ccid3_hc_rx_send_feedback(st
 {
 	struct ccid3_hc_rx_sock *hcrx = ccid3_hc_rx_sk(sk);
 	struct dccp_sock *dp = dccp_sk(sk);
-	struct timeval now, t_recv;
+	struct timeval now;
 	suseconds_t delta = 0;
 
 	dccp_timestamp(sk, &now);

@@ -771,12 +788,6 @@ static void ccid3_hc_rx_send_feedback(st
 	ccid3_pr_debug("Interval %ldusec, X_recv=%u, 1/p=%u\n", (long)delta,
 		       hcrx->ccid3hcrx_x_recv, hcrx->ccid3hcrx_pinv);
 
-	/* Elapsed time information [RFC 4340, 13.2] in units of 10 * usecs */
-	skb_get_timestamp(skb, &t_recv);
-	delta = timeval_delta(&now, &t_recv);
-	DCCP_BUG_ON(delta < 0);
-
-	hcrx->ccid3hcrx_elapsed_time	     = delta / 10;
 	hcrx->ccid3hcrx_tstamp_last_feedback = now;
 	hcrx->ccid3hcrx_ccval_last_counter   = dccp_hdr(skb)->dccph_ccval;
 	hcrx->ccid3hcrx_bytes_recv	     = 0;

@@ -801,10 +812,7 @@ static int ccid3_hc_rx_insert_options(st
 	x_recv = htonl(hcrx->ccid3hcrx_x_recv);
 	pinv   = htonl(hcrx->ccid3hcrx_pinv);
 
-	if ((hcrx->ccid3hcrx_elapsed_time != 0 &&
-	     dccp_insert_option_elapsed_time(sk, skb,
-					     hcrx->ccid3hcrx_elapsed_time)) ||
-	    dccp_insert_option_timestamp(sk, skb) ||
+	if (dccp_insert_option_timestamp(sk, skb) ||
 	    dccp_insert_option(sk, skb, TFRC_OPT_LOSS_EVENT_RATE,
 			       &pinv, sizeof(pinv)) ||
 	    dccp_insert_option(sk, skb, TFRC_OPT_RECEIVE_RATE,

@@ -1192,6 +1200,7 @@ static struct ccid_operations ccid3 = {
 	.ccid_hc_tx_packet_sent	   = ccid3_hc_tx_packet_sent,
 	.ccid_hc_tx_packet_recv	   = ccid3_hc_tx_packet_recv,
 	.ccid_hc_tx_parse_options  = ccid3_hc_tx_parse_options,
+	.ccid_hc_tx_insert_options = ccid3_hc_tx_insert_options,
 	.ccid_hc_rx_obj_size	   = sizeof(struct ccid3_hc_rx_sock),
 	.ccid_hc_rx_init	   = ccid3_hc_rx_init,
 	.ccid_hc_rx_exit	   = ccid3_hc_rx_exit,

@@ -564,6 +564,12 @@ int dccp_insert_options(struct sock *sk,
 			return -1;
 	}
 
+	if (dp->dccps_hc_tx_insert_options) {
+		if (ccid_hc_tx_insert_options(dp->dccps_hc_tx_ccid, sk, skb))
+			return -1;
+		dp->dccps_hc_tx_insert_options = 0;
+	}
+
 	if (dp->dccps_hc_rx_insert_options) {
 		if (ccid_hc_rx_insert_options(dp->dccps_hc_rx_ccid, sk, skb))
 			return -1;

@@ -140,7 +140,6 @@ enum ccid3_hc_rx_states {
  *  @ccid3hcrx_tstamp_last_ack  -  Time at which last feedback was sent
  *  @ccid3hcrx_hist  -  Packet history
  *  @ccid3hcrx_li_hist  -  Loss Interval History
- *  @ccid3hcrx_elapsed_time  -  Time since packet reception
  */
 struct ccid3_hc_rx_sock {
 	u64				ccid3hcrx_seqno_nonloss:48,

@@ -156,7 +155,6 @@ struct ccid3_hc_rx_sock {
 	struct timeval			ccid3hcrx_tstamp_last_ack;
 	struct list_head		ccid3hcrx_hist;
 	struct list_head		ccid3hcrx_li_hist;
-	u32				ccid3hcrx_elapsed_time;
 };
 
 static inline struct ccid3_hc_tx_sock *ccid3_hc_tx_sk(const struct sock *sk)