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/appletalk | |
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/appletalk')
-rw-r--r-- | net/appletalk/ddp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c index 07b5b82c5eab..0c850427a85b 100644 --- a/net/appletalk/ddp.c +++ b/net/appletalk/ddp.c | |||
@@ -959,7 +959,7 @@ static unsigned long atalk_sum_skb(const struct sk_buff *skb, int offset, | |||
959 | for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) { | 959 | for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) { |
960 | int end; | 960 | int end; |
961 | 961 | ||
962 | BUG_TRAP(start <= offset + len); | 962 | WARN_ON(start > offset + len); |
963 | 963 | ||
964 | end = start + skb_shinfo(skb)->frags[i].size; | 964 | end = start + skb_shinfo(skb)->frags[i].size; |
965 | if ((copy = end - offset) > 0) { | 965 | if ((copy = end - offset) > 0) { |
@@ -986,7 +986,7 @@ static unsigned long atalk_sum_skb(const struct sk_buff *skb, int offset, | |||
986 | for (; list; list = list->next) { | 986 | for (; list; list = list->next) { |
987 | int end; | 987 | int end; |
988 | 988 | ||
989 | BUG_TRAP(start <= offset + len); | 989 | WARN_ON(start > offset + len); |
990 | 990 | ||
991 | end = start + list->len; | 991 | end = start + list->len; |
992 | if ((copy = end - offset) > 0) { | 992 | if ((copy = end - offset) > 0) { |