From 6ee4b3a34c476250973913a51c2227843aef59b5 Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Mon, 19 Oct 2009 19:41:06 +0000
Subject: [PATCH] --- yaml --- r: 167706 b: refs/heads/master c:
 b6b39e8f3fbbb31001b836afec87bcaf4811a7bf h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 8fbc2ae4a5ba..a28921f275e1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 55b8050353c4a212c94d7156e2bd5885225b869b
+refs/heads/master: b6b39e8f3fbbb31001b836afec87bcaf4811a7bf
diff --git a/trunk/net/ipv4/tcp.c b/trunk/net/ipv4/tcp.c
index 9b2756fbdf9b..90b2e0649bfb 100644
--- a/trunk/net/ipv4/tcp.c
+++ b/trunk/net/ipv4/tcp.c
@@ -1442,7 +1442,9 @@ int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
 				goto found_ok_skb;
 			if (tcp_hdr(skb)->fin)
 				goto found_fin_ok;
-			WARN_ON(!(flags & MSG_PEEK));
+			if (WARN_ON(!(flags & MSG_PEEK)))
+				printk(KERN_INFO "recvmsg bug 2: copied %X "
+				       "seq %X\n", *seq, TCP_SKB_CB(skb)->seq);
 		}
 
 		/* Well, if we have backlog, try to process it now yet. */