diff options
author | Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> | 2008-07-26 00:43:18 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-07-26 00:43:18 -0400 |
commit | 547b792cac0a038b9dbf958d3c120df3740b5572 (patch) | |
tree | 08554d083b0ca7d65739dc1ce12f9b12a9b8e1f8 /net/dccp/timer.c | |
parent | 53e5e96ec18da6f65e89f05674711e1c93d8df67 (diff) |
net: convert BUG_TRAP to generic WARN_ON
Removes legacy reinvent-the-wheel type thing. The generic
machinery integrates much better to automated debugging aids
such as kerneloops.org (and others), and is unambiguous due to
better naming. Non-intuively BUG_TRAP() is actually equal to
WARN_ON() rather than BUG_ON() though some might actually be
promoted to BUG_ON() but I left that to future.
I could make at least one BUILD_BUG_ON conversion.
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp/timer.c')
-rw-r--r-- | net/dccp/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dccp/timer.c b/net/dccp/timer.c index 3608d5342ca2..6a5b961b6f5c 100644 --- a/net/dccp/timer.c +++ b/net/dccp/timer.c | |||
@@ -106,7 +106,7 @@ static void dccp_retransmit_timer(struct sock *sk) | |||
106 | * -- Acks in client-PARTOPEN state (sec. 8.1.5) | 106 | * -- Acks in client-PARTOPEN state (sec. 8.1.5) |
107 | * -- CloseReq in server-CLOSEREQ state (sec. 8.3) | 107 | * -- CloseReq in server-CLOSEREQ state (sec. 8.3) |
108 | * -- Close in node-CLOSING state (sec. 8.3) */ | 108 | * -- Close in node-CLOSING state (sec. 8.3) */ |
109 | BUG_TRAP(sk->sk_send_head != NULL); | 109 | WARN_ON(sk->sk_send_head == NULL); |
110 | 110 | ||
111 | /* | 111 | /* |
112 | * More than than 4MSL (8 minutes) has passed, a RESET(aborted) was | 112 | * More than than 4MSL (8 minutes) has passed, a RESET(aborted) was |