|
@@ -1193,7 +1193,7 @@ void tcp_cleanup_rbuf(struct sock *sk, int copied)
|
|
struct sk_buff *skb = skb_peek(&sk->sk_receive_queue);
|
|
struct sk_buff *skb = skb_peek(&sk->sk_receive_queue);
|
|
|
|
|
|
WARN(skb && !before(tp->copied_seq, TCP_SKB_CB(skb)->end_seq),
|
|
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);
|
|
tp->copied_seq, TCP_SKB_CB(skb)->end_seq, tp->rcv_nxt);
|
|
#endif
|
|
#endif
|
|
|
|
|
|
@@ -1477,10 +1477,9 @@ int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
|
|
* shouldn't happen.
|
|
* shouldn't happen.
|
|
*/
|
|
*/
|
|
if (WARN(before(*seq, TCP_SKB_CB(skb)->seq),
|
|
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,
|
|
|
|
- flags))
|
|
|
|
|
|
+ "recvmsg bug: copied %X seq %X rcvnxt %X fl %X\n",
|
|
|
|
+ *seq, TCP_SKB_CB(skb)->seq, tp->rcv_nxt,
|
|
|
|
+ flags))
|
|
break;
|
|
break;
|
|
|
|
|
|
offset = *seq - TCP_SKB_CB(skb)->seq;
|
|
offset = *seq - TCP_SKB_CB(skb)->seq;
|
|
@@ -1490,10 +1489,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;
|
|
- 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. */
|
|
/* Well, if we have backlog, try to process it now yet. */
|