Commit c62f4c45 authored by Arjan van de Ven's avatar Arjan van de Ven Committed by David S. Miller

net: use WARN() for the WARN_ON in commit b6b39e8f

Commit b6b39e8f (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: default avatarArjan van de Ven <arjan@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 74eee2e8
...@@ -1442,9 +1442,9 @@ int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, ...@@ -1442,9 +1442,9 @@ int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
goto found_ok_skb; goto found_ok_skb;
if (tcp_hdr(skb)->fin) if (tcp_hdr(skb)->fin)
goto found_fin_ok; goto found_fin_ok;
if (WARN_ON(!(flags & MSG_PEEK))) WARN(!(flags & MSG_PEEK), KERN_INFO "recvmsg bug 2: "
printk(KERN_INFO "recvmsg bug 2: copied %X " "copied %X seq %X\n", *seq,
"seq %X\n", *seq, TCP_SKB_CB(skb)->seq); TCP_SKB_CB(skb)->seq);
} }
/* Well, if we have backlog, try to process it now yet. */ /* Well, if we have backlog, try to process it now yet. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment