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/ipv6/af_inet6.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/ipv6/af_inet6.c')
-rw-r--r-- | net/ipv6/af_inet6.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index 3d828bc4b1cf..0843c4d6218c 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c | |||
@@ -153,7 +153,7 @@ lookup_protocol: | |||
153 | answer_flags = answer->flags; | 153 | answer_flags = answer->flags; |
154 | rcu_read_unlock(); | 154 | rcu_read_unlock(); |
155 | 155 | ||
156 | BUG_TRAP(answer_prot->slab != NULL); | 156 | WARN_ON(answer_prot->slab == NULL); |
157 | 157 | ||
158 | err = -ENOBUFS; | 158 | err = -ENOBUFS; |
159 | sk = sk_alloc(net, PF_INET6, GFP_KERNEL, answer_prot); | 159 | sk = sk_alloc(net, PF_INET6, GFP_KERNEL, answer_prot); |