From 5c7413ed8a7d4355d82bb8fc81513752b0ac91c5 Mon Sep 17 00:00:00 2001 From: Arjan van de Ven Date: Thu, 22 Oct 2009 21:37:56 -0700 Subject: [PATCH] --- yaml --- r: 167933 b: refs/heads/master c: c62f4c453ab4b0240ab857bfd089da2c01ad91e7 h: refs/heads/master i: 167931: 4a7352e13d952b743d959702413455f5f8198399 v: v3 --- [refs] | 2 +- trunk/net/ipv4/tcp.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 5d1636cf7354..ebe66b024b0b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 74eee2e8d08048c847d1998c686e12a477ff939a +refs/heads/master: c62f4c453ab4b0240ab857bfd089da2c01ad91e7 diff --git a/trunk/net/ipv4/tcp.c b/trunk/net/ipv4/tcp.c index 90b2e0649bfb..98440ad82558 100644 --- a/trunk/net/ipv4/tcp.c +++ b/trunk/net/ipv4/tcp.c @@ -1442,9 +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; - if (WARN_ON(!(flags & MSG_PEEK))) - printk(KERN_INFO "recvmsg bug 2: copied %X " - "seq %X\n", *seq, TCP_SKB_CB(skb)->seq); + WARN(!(flags & MSG_PEEK), 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. */