diff options
author | Joe Perches <joe@perches.com> | 2010-10-30 07:08:53 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-11-09 12:22:32 -0500 |
commit | 2af6fd8b18ceed416c9dfa675287c765aabf7d43 (patch) | |
tree | 6ddfb64096961839e0cf5a349ff8ff977ca9d542 /net/ipv4 | |
parent | b194a3674fba6d9f9e470084d192c7cb99194a62 (diff) |
net/ipv4/tcp.c: Update WARN uses
Coalesce long formats.
Align arguments.
Remove KERN_<level>.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/tcp.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 1664a0590bb8..5f738c5c0dc4 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c | |||
@@ -1193,7 +1193,7 @@ void tcp_cleanup_rbuf(struct sock *sk, int copied) | |||
1193 | struct sk_buff *skb = skb_peek(&sk->sk_receive_queue); | 1193 | struct sk_buff *skb = skb_peek(&sk->sk_receive_queue); |
1194 | 1194 | ||
1195 | WARN(skb && !before(tp->copied_seq, TCP_SKB_CB(skb)->end_seq), | 1195 | WARN(skb && !before(tp->copied_seq, TCP_SKB_CB(skb)->end_seq), |
1196 | KERN_INFO "cleanup rbuf bug: copied %X seq %X rcvnxt %X\n", | 1196 | "cleanup rbuf bug: copied %X seq %X rcvnxt %X\n", |
1197 | tp->copied_seq, TCP_SKB_CB(skb)->end_seq, tp->rcv_nxt); | 1197 | tp->copied_seq, TCP_SKB_CB(skb)->end_seq, tp->rcv_nxt); |
1198 | #endif | 1198 | #endif |
1199 | 1199 | ||
@@ -1477,10 +1477,9 @@ int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, | |||
1477 | * shouldn't happen. | 1477 | * shouldn't happen. |
1478 | */ | 1478 | */ |
1479 | if (WARN(before(*seq, TCP_SKB_CB(skb)->seq), | 1479 | if (WARN(before(*seq, TCP_SKB_CB(skb)->seq), |
1480 | KERN_INFO "recvmsg bug: copied %X " | 1480 | "recvmsg bug: copied %X seq %X rcvnxt %X fl %X\n", |
1481 | "seq %X rcvnxt %X fl %X\n", *seq, | 1481 | *seq, TCP_SKB_CB(skb)->seq, tp->rcv_nxt, |
1482 | TCP_SKB_CB(skb)->seq, tp->rcv_nxt, | 1482 | flags)) |
1483 | flags)) | ||
1484 | break; | 1483 | break; |
1485 | 1484 | ||
1486 | offset = *seq - TCP_SKB_CB(skb)->seq; | 1485 | offset = *seq - TCP_SKB_CB(skb)->seq; |
@@ -1490,10 +1489,9 @@ int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, | |||
1490 | goto found_ok_skb; | 1489 | goto found_ok_skb; |
1491 | if (tcp_hdr(skb)->fin) | 1490 | if (tcp_hdr(skb)->fin) |
1492 | goto found_fin_ok; | 1491 | goto found_fin_ok; |
1493 | WARN(!(flags & MSG_PEEK), KERN_INFO "recvmsg bug 2: " | 1492 | WARN(!(flags & MSG_PEEK), |
1494 | "copied %X seq %X rcvnxt %X fl %X\n", | 1493 | "recvmsg bug 2: copied %X seq %X rcvnxt %X fl %X\n", |
1495 | *seq, TCP_SKB_CB(skb)->seq, | 1494 | *seq, TCP_SKB_CB(skb)->seq, tp->rcv_nxt, flags); |
1496 | tp->rcv_nxt, flags); | ||
1497 | } | 1495 | } |
1498 | 1496 | ||
1499 | /* Well, if we have backlog, try to process it now yet. */ | 1497 | /* Well, if we have backlog, try to process it now yet. */ |