From 8b4d071601d1fcc4693286793dbf2e39586d11b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= <ilpo.jarvinen@helsinki.fi>
Date: Mon, 26 Nov 2007 20:17:38 +0800
Subject: [PATCH] --- yaml --- r: 78213 b: refs/heads/master c:
 8512430e554a84275669f78f86dce18566d5cf7a h: refs/heads/master i:   78211:
 bc4e67fade6c824f52bd8c350565b9c399c4fbf1 v: v3

---
 [refs]                      | 2 +-
 trunk/include/net/tcp.h     | 5 -----
 trunk/net/ipv4/tcp_output.c | 4 ++++
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 82911c867d96..cc2f4a20bfd0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 82d8a867ffaed7fe58e789103b32c0fc6b79dafd
+refs/heads/master: 8512430e554a84275669f78f86dce18566d5cf7a
diff --git a/trunk/include/net/tcp.h b/trunk/include/net/tcp.h
index f0c5e7a29400..7e583261f3a0 100644
--- a/trunk/include/net/tcp.h
+++ b/trunk/include/net/tcp.h
@@ -1236,14 +1236,9 @@ static inline struct sk_buff *tcp_send_head(struct sock *sk)
 
 static inline void tcp_advance_send_head(struct sock *sk, struct sk_buff *skb)
 {
-	struct tcp_sock *tp = tcp_sk(sk);
-
 	sk->sk_send_head = skb->next;
 	if (sk->sk_send_head == (struct sk_buff *)&sk->sk_write_queue)
 		sk->sk_send_head = NULL;
-	/* Don't override Nagle indefinately with F-RTO */
-	if (tp->frto_counter == 2)
-		tp->frto_counter = 3;
 }
 
 static inline void tcp_check_send_head(struct sock *sk, struct sk_buff *skb_unlinked)
diff --git a/trunk/net/ipv4/tcp_output.c b/trunk/net/ipv4/tcp_output.c
index 030fc69ea217..546f385a405f 100644
--- a/trunk/net/ipv4/tcp_output.c
+++ b/trunk/net/ipv4/tcp_output.c
@@ -80,6 +80,10 @@ static void update_send_head(struct sock *sk, struct sk_buff *skb)
 	tcp_advance_send_head(sk, skb);
 	tp->snd_nxt = TCP_SKB_CB(skb)->end_seq;
 	tcp_packets_out_inc(sk, skb);
+
+	/* Don't override Nagle indefinately with F-RTO */
+	if (tp->frto_counter == 2)
+		tp->frto_counter = 3;
 }
 
 /* SND.NXT, if window was not shrunk.