---

yaml --- r: 278345 b: refs/heads/master c: 761965e h: refs/heads/master i: 278343: 578abba v: v3
git-mirror · Dec 4, 2011 · f7f9fd9 · f7f9fd9
1 parent a85efd9
commit f7f9fd9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -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) {