git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
net
/
ipv4
/
tcp.c
diff --git
a/net/ipv4/tcp.c
b/net/ipv4/tcp.c
index
0b491bf
..
1ab341e
100644
(file)
--- a/
net/ipv4/tcp.c
+++ b/
net/ipv4/tcp.c
@@
-1096,7
+1096,7
@@
void tcp_cleanup_rbuf(struct sock *sk, int copied)
#if TCP_DEBUG
struct sk_buff *skb = skb_peek(&sk->sk_receive_queue);
#if TCP_DEBUG
struct sk_buff *skb = skb_peek(&sk->sk_receive_queue);
-
BUG_TRAP(!skb ||
before(tp->copied_seq, TCP_SKB_CB(skb)->end_seq));
+
WARN_ON(skb && !
before(tp->copied_seq, TCP_SKB_CB(skb)->end_seq));
#endif
if (inet_csk_ack_scheduled(sk)) {
#endif
if (inet_csk_ack_scheduled(sk)) {
@@
-1358,7
+1358,7
@@
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;
goto found_ok_skb;
if (tcp_hdr(skb)->fin)
goto found_fin_ok;
-
BUG_TRAP(flags & MSG_PEEK
);
+
WARN_ON(!(flags & MSG_PEEK)
);
skb = skb->next;
} while (skb != (struct sk_buff *)&sk->sk_receive_queue);
skb = skb->next;
} while (skb != (struct sk_buff *)&sk->sk_receive_queue);
@@
-1421,8
+1421,8
@@
int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
tp->ucopy.len = len;
tp->ucopy.len = len;
- BUG_TRAP(tp->copied_seq == tp->rcv_nxt ||
-
(flags & (MSG_PEEK | MSG_TRUNC)));
+ WARN_ON(tp->copied_seq != tp->rcv_nxt &&
+
!
(flags & (MSG_PEEK | MSG_TRUNC)));
/* Ugly... If prequeue is not empty, we have to
* process it before releasing socket, otherwise
/* Ugly... If prequeue is not empty, we have to
* process it before releasing socket, otherwise
@@
-1844,7
+1844,7
@@
adjudge_to_death:
*/
local_bh_disable();
bh_lock_sock(sk);
*/
local_bh_disable();
bh_lock_sock(sk);
-
BUG_TRAP(!
sock_owned_by_user(sk));
+
WARN_ON(
sock_owned_by_user(sk));
/* Have we already been destroyed by a softirq or backlog? */
if (state != TCP_CLOSE && sk->sk_state == TCP_CLOSE)
/* Have we already been destroyed by a softirq or backlog? */
if (state != TCP_CLOSE && sk->sk_state == TCP_CLOSE)
@@
-1973,7
+1973,7
@@
int tcp_disconnect(struct sock *sk, int flags)
memset(&tp->rx_opt, 0, sizeof(tp->rx_opt));
__sk_dst_reset(sk);
memset(&tp->rx_opt, 0, sizeof(tp->rx_opt));
__sk_dst_reset(sk);
-
BUG_TRAP(!inet->num ||
icsk->icsk_bind_hash);
+
WARN_ON(inet->num && !
icsk->icsk_bind_hash);
sk->sk_error_report(sk);
return err;
sk->sk_error_report(sk);
return err;