diff options
author | Kris Katterjohn <kjak@users.sourceforge.net> | 2006-01-09 01:24:28 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-01-09 17:16:18 -0500 |
commit | 09a626600b437d91f6b13ade5c7c4b374893c54e (patch) | |
tree | a6de3c2a33b7d896cd22a3fe799d1b40d28daf40 /net/xfrm | |
parent | 4bba3925924148c24fb0c7636a04ad69a6a56b84 (diff) |
[NET]: Change some "if (x) BUG();" to "BUG_ON(x);"
This changes some simple "if (x) BUG();" statements to "BUG_ON(x);"
Signed-off-by: Kris Katterjohn <kjak@users.sourceforge.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/xfrm')
-rw-r--r-- | net/xfrm/xfrm_algo.c | 6 | ||||
-rw-r--r-- | net/xfrm/xfrm_policy.c | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/net/xfrm/xfrm_algo.c b/net/xfrm/xfrm_algo.c index 2f4531fcaca2..6ed3302312fb 100644 --- a/net/xfrm/xfrm_algo.c +++ b/net/xfrm/xfrm_algo.c | |||
@@ -540,8 +540,7 @@ void skb_icv_walk(const struct sk_buff *skb, struct crypto_tfm *tfm, | |||
540 | start = end; | 540 | start = end; |
541 | } | 541 | } |
542 | } | 542 | } |
543 | if (len) | 543 | BUG_ON(len); |
544 | BUG(); | ||
545 | } | 544 | } |
546 | EXPORT_SYMBOL_GPL(skb_icv_walk); | 545 | EXPORT_SYMBOL_GPL(skb_icv_walk); |
547 | 546 | ||
@@ -610,8 +609,7 @@ skb_to_sgvec(struct sk_buff *skb, struct scatterlist *sg, int offset, int len) | |||
610 | start = end; | 609 | start = end; |
611 | } | 610 | } |
612 | } | 611 | } |
613 | if (len) | 612 | BUG_ON(len); |
614 | BUG(); | ||
615 | return elt; | 613 | return elt; |
616 | } | 614 | } |
617 | EXPORT_SYMBOL_GPL(skb_to_sgvec); | 615 | EXPORT_SYMBOL_GPL(skb_to_sgvec); |
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index 59614a994b4e..077bbf9fb9b7 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c | |||
@@ -248,11 +248,9 @@ EXPORT_SYMBOL(xfrm_policy_alloc); | |||
248 | 248 | ||
249 | void __xfrm_policy_destroy(struct xfrm_policy *policy) | 249 | void __xfrm_policy_destroy(struct xfrm_policy *policy) |
250 | { | 250 | { |
251 | if (!policy->dead) | 251 | BUG_ON(!policy->dead); |
252 | BUG(); | ||
253 | 252 | ||
254 | if (policy->bundles) | 253 | BUG_ON(policy->bundles); |
255 | BUG(); | ||
256 | 254 | ||
257 | if (del_timer(&policy->timer)) | 255 | if (del_timer(&policy->timer)) |
258 | BUG(); | 256 | BUG(); |