diff options
| author | Arjan van de Ven <arjan@linux.intel.com> | 2009-10-22 21:37:56 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-22 21:37:56 -0700 |
| commit | c62f4c453ab4b0240ab857bfd089da2c01ad91e7 (patch) | |
| tree | 2c99ed102d752d762cc051ee1e89539e0453bdc0 /net | |
| parent | 74eee2e8d08048c847d1998c686e12a477ff939a (diff) | |
| download | linux-stable-c62f4c453ab4b0240ab857bfd089da2c01ad91e7.tar.gz linux-stable-c62f4c453ab4b0240ab857bfd089da2c01ad91e7.tar.bz2 linux-stable-c62f4c453ab4b0240ab857bfd089da2c01ad91e7.zip | |
net: use WARN() for the WARN_ON in commit b6b39e8f3fbbb
Commit b6b39e8f3fbbb (tcp: Try to catch MSG_PEEK bug) added a printk()
to the WARN_ON() that's in tcp.c. This patch changes this combination
to WARN(); the advantage of WARN() is that the printk message shows up
inside the message, so that kerneloops.org will collect the message.
In addition, this gets rid of an extra if() statement.
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/tcp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 90b2e0649bfb..98440ad82558 100644 --- a/net/ipv4/tcp.c +++ b/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. */ |