From f7f9fd9e8ed584cb0d66b82ca649d39c8f193150 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Sun, 4 Dec 2011 07:05:17 +0000
Subject: [PATCH] --- yaml --- r: 278345 b: refs/heads/master c:
 761965eab38d2cbc59c36e355c59609e3a04705a h: refs/heads/master i:   278343:
 578abba463e78e48f44cbc57b30cadef64f1f002 v: v3

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

diff --git a/[refs] b/[refs]
index caefc59e8d74..83cff35e247e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 117632e64d2a5f464e491fe221d7169a3814a77b
+refs/heads/master: 761965eab38d2cbc59c36e355c59609e3a04705a
diff --git a/trunk/net/ipv4/tcp.c b/trunk/net/ipv4/tcp.c
index 45156be3abfd..a09fe253b917 100644
--- a/trunk/net/ipv4/tcp.c
+++ b/trunk/net/ipv4/tcp.c
@@ -1009,7 +1009,12 @@ int tcp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
 				int merge = 0;
 				int i = skb_shinfo(skb)->nr_frags;
 				struct page *page = TCP_PAGE(sk);
-				int off = TCP_OFF(sk);
+				int off;
+
+				if (page && page_count(page) == 1)
+					TCP_OFF(sk) = 0;
+
+				off = TCP_OFF(sk);
 
 				if (skb_can_coalesce(skb, i, page, off) &&
 				    off != PAGE_SIZE) {