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 'x86/fpu' into x86/urgent
[pandora-kernel.git]
/
net
/
ipv4
/
inet_timewait_sock.c
diff --git
a/net/ipv4/inet_timewait_sock.c
b/net/ipv4/inet_timewait_sock.c
index
75c2def
..
d985bd6
100644
(file)
--- a/
net/ipv4/inet_timewait_sock.c
+++ b/
net/ipv4/inet_timewait_sock.c
@@
-86,7
+86,7
@@
void __inet_twsk_hashdance(struct inet_timewait_sock *tw, struct sock *sk,
hashinfo->bhash_size)];
spin_lock(&bhead->lock);
tw->tw_tb = icsk->icsk_bind_hash;
-
BUG_TRAP(
icsk->icsk_bind_hash);
+
WARN_ON(!
icsk->icsk_bind_hash);
inet_twsk_add_bind_node(tw, &tw->tw_tb->owners);
spin_unlock(&bhead->lock);