X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=net%2Fcore%2Fstream.c;h=a6b3437ff082d9cf98b59bb754b409817f3b4597;hb=358c323c17ac527b82c6333db6a485112c21ab0d;hp=4a0ad152c9c4492c35fc3abc6ac21bf4580abb20;hpb=dd07a8db7283f52f347aee468007556944b5b393;p=linux-2.6

diff --git a/net/core/stream.c b/net/core/stream.c
index 4a0ad152c9..a6b3437ff0 100644
--- a/net/core/stream.c
+++ b/net/core/stream.c
@@ -192,13 +192,13 @@ void sk_stream_kill_queues(struct sock *sk)
 	__skb_queue_purge(&sk->sk_error_queue);
 
 	/* Next, the write queue. */
-	BUG_TRAP(skb_queue_empty(&sk->sk_write_queue));
+	WARN_ON(!skb_queue_empty(&sk->sk_write_queue));
 
 	/* Account for returned memory. */
 	sk_mem_reclaim(sk);
 
-	BUG_TRAP(!sk->sk_wmem_queued);
-	BUG_TRAP(!sk->sk_forward_alloc);
+	WARN_ON(sk->sk_wmem_queued);
+	WARN_ON(sk->sk_forward_alloc);
 
 	/* It is _impossible_ for the backlog to contain anything
 	 * when we get here.  All user references to this socket