Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2af6fd8b authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

net/ipv4/tcp.c: Update WARN uses 



Coalesce long formats.
Align arguments.
Remove KERN_<level>.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b194a367

net/ipv4/tcp.c

+7 −9
Original line number Diff line number Diff line
@@ -1193,7 +1193,7 @@ void tcp_cleanup_rbuf(struct sock *sk, int copied) 
	struct sk_buff *skb = skb_peek(&sk->sk_receive_queue);



	WARN(skb && !before(tp->copied_seq, TCP_SKB_CB(skb)->end_seq),

	     KERN_INFO "cleanup rbuf bug: copied %X seq %X rcvnxt %X\n",

	     "cleanup rbuf bug: copied %X seq %X rcvnxt %X\n",

	     tp->copied_seq, TCP_SKB_CB(skb)->end_seq, tp->rcv_nxt);

#endif
@@ -1477,9 +1477,8 @@ int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, 
			 * shouldn't happen.

			 */

			if (WARN(before(*seq, TCP_SKB_CB(skb)->seq),

			     KERN_INFO "recvmsg bug: copied %X "

				       "seq %X rcvnxt %X fl %X\n", *seq,

				       TCP_SKB_CB(skb)->seq, tp->rcv_nxt,

				 "recvmsg bug: copied %X seq %X rcvnxt %X fl %X\n",

				 *seq, TCP_SKB_CB(skb)->seq, tp->rcv_nxt,

				 flags))

				break;
@@ -1490,10 +1489,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(!(flags & MSG_PEEK), KERN_INFO "recvmsg bug 2: "

					"copied %X seq %X rcvnxt %X fl %X\n",

					*seq, TCP_SKB_CB(skb)->seq,

					tp->rcv_nxt, flags);

			WARN(!(flags & MSG_PEEK),

			     "recvmsg bug 2: copied %X seq %X rcvnxt %X fl %X\n",

			     *seq, TCP_SKB_CB(skb)->seq, tp->rcv_nxt, flags);

		}



		/* Well, if we have backlog, try to process it now yet. */