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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
net
/
dccp
/
proto.c
diff --git
a/net/dccp/proto.c
b/net/dccp/proto.c
index
a0b5600
..
b622d97
100644
(file)
--- a/
net/dccp/proto.c
+++ b/
net/dccp/proto.c
@@
-327,7
+327,7
@@
int dccp_disconnect(struct sock *sk, int flags)
inet_csk_delack_init(sk);
__sk_dst_reset(sk);
inet_csk_delack_init(sk);
__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;
@@
-981,7
+981,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 != DCCP_CLOSED && sk->sk_state == DCCP_CLOSED)
/* Have we already been destroyed by a softirq or backlog? */
if (state != DCCP_CLOSED && sk->sk_state == DCCP_CLOSED)