Skip to contentSkip to conversation

tcp: RFC3465 Appropriate Byte Count fix

PATCH In review Daikichi Osuga 2 participants 2 messages Aug 22, 2006 – Aug 29, 2006

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tcp: RFC3465 Appropriate Byte Count fix

From: Daikichi Osuga <[email protected]>

RFC3465 Appropriate Byte Count fix
slow start after retransmit timeout does not work is fixed. case of L=2*SMSS acked bytes comparison is fixed.

net/ipv4/tcp_input.c +7 -2
@@ -2450,8 +2450,13 @@ static int tcp_ack(struct sock *sk, stru
 	if (before(ack, prior_snd_una))
 		goto old_ack;
 
-	if (sysctl_tcp_abc && icsk->icsk_ca_state < TCP_CA_CWR)
-		tp->bytes_acked += ack - prior_snd_una;
+	if (sysctl_tcp_abc) {
+		if (icsk->icsk_ca_state < TCP_CA_CWR)
+			tp->bytes_acked += ack - prior_snd_una;
+		else if (icsk->icsk_ca_state == TCP_CA_Loss)
+			/* we assume just one segment left network */
+			tp->bytes_acked += min(ack - prior_snd_una, tp->mss_cache);
+	}
 
 	if (!(flag&FLAG_SLOWPATH) && after(ack, prior_snd_una)) {
 		/* Window is constant, pure forward advance.
net/ipv4/tcp_cong.c +1 -1
@@ -190,7 +190,7 @@ void tcp_slow_start(struct tcp_sock *tp)
 			return;
 
 		/* We MAY increase by 2 if discovered delayed ack */
-		if (sysctl_tcp_abc > 1 && tp->bytes_acked > 2*tp->mss_cache) {
+		if (sysctl_tcp_abc > 1 && tp->bytes_acked >= 2*tp->mss_cache) {
 			if (tp->snd_cwnd < tp->snd_cwnd_clamp)
 				tp->snd_cwnd++;
 		}