From 3a40b7ed3c9ade73394ad5aeb5d73abc9a31821a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= <ilpo.jarvinen@helsinki.fi>
Date: Sat, 20 Sep 2008 21:24:49 -0700
Subject: [PATCH] --- yaml --- r: 111743 b: refs/heads/master c:
 f0ceb0ed86b4792a4ed9d3438f5f7572e48f9803 h: refs/heads/master i:   111741:
 001cc618c6789517af2824858579e2ac0eef9835   111739:
 035592ace04653d5bbec24fbadcba5033500f6a6   111735:
 60641f0ac52dab776e2722ca88eea2bec3c2ead9   111727:
 b98a8378b1065c76d36b98eb522453ce08b24d65   111711:
 e9da6d738fcb4d44c3658a1b07882b031585a069   111679:
 76fd3b2ce7cf355dabe985030c115ceaee1f5d83   111615:
 7c626130ac08c0222b2c0af39ca286ae3c25865c v: v3

---
 [refs]                      | 2 +-
 trunk/net/ipv4/tcp_output.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 4f0c35e4092f..d738de80052c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e1c54c2a405494281e0639aacc90db03b50ae77
+refs/heads/master: f0ceb0ed86b4792a4ed9d3438f5f7572e48f9803
diff --git a/trunk/net/ipv4/tcp_output.c b/trunk/net/ipv4/tcp_output.c
index b5b4ddcdda41..f900fae8b87e 100644
--- a/trunk/net/ipv4/tcp_output.c
+++ b/trunk/net/ipv4/tcp_output.c
@@ -2096,10 +2096,8 @@ void tcp_xmit_retransmit_queue(struct sock *sk)
 		if (sacked & (TCPCB_SACKED_ACKED|TCPCB_SACKED_RETRANS))
 			continue;
 
-		if (tcp_retransmit_skb(sk, skb)) {
-			tp->retransmit_skb_hint = NULL;
+		if (tcp_retransmit_skb(sk, skb))
 			return;
-		}
 		NET_INC_STATS_BH(sock_net(sk), mib_idx);
 
 		if (skb == tcp_write_queue_head(sk))