From: Ilpo Järvinen Date: Mon, 1 Oct 2007 22:28:48 +0000 (-0700) Subject: [TCP]: Wrap-safed reordering detection FRTO check X-Git-Tag: v2.6.24-rc1~1454^2~223 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3de96471bd7fb76406e975ef6387abe3a0698149;p=linux-2.6-omap-h63xx.git [TCP]: Wrap-safed reordering detection FRTO check In case somebody has a suggestion about a better place for this check, which must guarantee execution "early enough" (i.e, before the wrap can occur), I'm very open to them. Signed-off-by: Ilpo Järvinen Signed-off-by: David S. Miller --- diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index c1339d88bbf..7c1a92ffa08 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -3027,6 +3027,9 @@ static int tcp_ack(struct sock *sk, struct sk_buff *skb, int flag) /* See if we can take anything off of the retransmit queue. */ flag |= tcp_clean_rtx_queue(sk, &seq_rtt); + /* Guarantee sacktag reordering detection against wrap-arounds */ + if (before(tp->frto_highmark, tp->snd_una)) + tp->frto_highmark = 0; if (tp->frto_counter) frto_cwnd = tcp_process_frto(sk, flag);