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

Commit 90feeb95 authored by Gerrit Renker's avatar Gerrit Renker Committed by David S. Miller
Browse files

[DCCP] ccid3: Fix bug in calculation of first t_nom and first t_ipi 

Problem:
parent 6472c051

net/dccp/ccids/ccid3.c

+6 −5
Original line number Diff line number Diff line
@@ -298,13 +298,14 @@ static int ccid3_hc_tx_send_packet(struct sock *sk, 
		hctx->ccid3hctx_last_win_count	 = 0;

		hctx->ccid3hctx_t_last_win_count = now;

		ccid3_hc_tx_set_state(sk, TFRC_SSTATE_NO_FBACK);

		hctx->ccid3hctx_t_ipi = TFRC_INITIAL_IPI;



		/* Set nominal send time for initial packet */

		/* First timeout, according to [RFC 3448, 4.2], is 1 second */

		hctx->ccid3hctx_t_ipi = USEC_PER_SEC;

		/* Initial delta: minimum of 0.5 sec and t_gran/2 */

		hctx->ccid3hctx_delta = TFRC_OPSYS_HALF_TIME_GRAN;



		/* Set t_0 for initial packet */

		hctx->ccid3hctx_t_nom = now;

		timeval_add_usecs(&hctx->ccid3hctx_t_nom,

				  hctx->ccid3hctx_t_ipi);

		ccid3_calc_new_delta(hctx);

		rc = 0;

		break;

	case TFRC_SSTATE_NO_FBACK:

net/dccp/ccids/ccid3.h

+0 −2
Original line number Diff line number Diff line
@@ -49,8 +49,6 @@ 
/* Two seconds as per CCID3 spec */

#define TFRC_INITIAL_TIMEOUT	   (2 * USEC_PER_SEC)



#define TFRC_INITIAL_IPI	   (USEC_PER_SEC / 4)



/* In usecs - half the scheduling granularity as per RFC3448 4.6 */

#define TFRC_OPSYS_HALF_TIME_GRAN  (USEC_PER_SEC / (2 * HZ))