[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>

2 files changed, 8 insertions, 16 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index 5081287923d5..bf66b114d3c2 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1092,15 +1092,12 @@ int skb_checksum_help(struct sk_buff *skb, int inward)
                         goto out;
         }
 
-        if (offset > (int)skb->len)
-                BUG();
+        BUG_ON(offset > (int)skb->len);
         csum = skb_checksum(skb, offset, skb->len-offset, 0);
 
         offset = skb->tail - skb->h.raw;
-        if (offset <= 0)
-                BUG();
-        if (skb->csum + 2 > offset)
-                BUG();
+        BUG_ON(offset <= 0);
+        BUG_ON(skb->csum + 2 > offset);
 
         *(u16*)(skb->h.raw + skb->csum) = csum_fold(csum);
         skb->ip_summed = CHECKSUM_NONE;
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 070f91cfde59..d0732e9c8560 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -791,8 +791,7 @@ int ___pskb_trim(struct sk_buff *skb, unsigned int len, int realloc)
                 int end = offset + skb_shinfo(skb)->frags[i].size;
                 if (end > len) {
                         if (skb_cloned(skb)) {
-                                if (!realloc)
-                                        BUG();
+                                BUG_ON(!realloc);
                                 if (pskb_expand_head(skb, 0, 0, GFP_ATOMIC))
                                         return -ENOMEM;
                         }
@@ -894,8 +893,7 @@ unsigned char *__pskb_pull_tail(struct sk_buff *skb, int delta)
                 struct sk_buff *insp = NULL;
 
                 do {
-                        if (!list)
-                                BUG();
+                        BUG_ON(!list);
 
                         if (list->len <= eat) {
                                 /* Eaten as whole. */
@@ -1199,8 +1197,7 @@ unsigned int skb_checksum(const struct sk_buff *skb, int offset,
                         start = end;
                 }
         }
-        if (len)
-                BUG();
+        BUG_ON(len);
 
         return csum;
 }
@@ -1282,8 +1279,7 @@ unsigned int skb_copy_and_csum_bits(const struct sk_buff *skb, int offset,
                         start = end;
                 }
         }
-        if (len)
-                BUG();
+        BUG_ON(len);
         return csum;
 }
 
@@ -1297,8 +1293,7 @@ void skb_copy_and_csum_dev(const struct sk_buff *skb, u8 *to)
         else
                 csstart = skb_headlen(skb);
 
-        if (csstart > skb_headlen(skb))
-                BUG();
+        BUG_ON(csstart > skb_headlen(skb));
 
         memcpy(to, skb->data, csstart);