Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux-2.6-block.git] / net / key / af_key.c

diff --git a/net/key/af_key.c b/net/key/af_key.c
index fe5fc4bab7eeb5c463d0bdd6b371c53b313e53d9..b67ed3a8486c259b33a79bf4758aa1a16e972705 100644 (file)
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -928,8 +928,7 @@ static struct sk_buff *__pfkey_xfrm_state2msg(const struct xfrm_state *x,
                pfkey_sockaddr_fill(&x->props.saddr, 0,
                                    (struct sockaddr *) (addr + 1),
                                    x->props.family);
-       if (!addr->sadb_address_prefixlen)
-               BUG();
+       BUG_ON(!addr->sadb_address_prefixlen);
 
        /* dst address */
        addr = skb_put(skb, sizeof(struct sadb_address) + sockaddr_size);
@@ -944,8 +943,7 @@ static struct sk_buff *__pfkey_xfrm_state2msg(const struct xfrm_state *x,
                pfkey_sockaddr_fill(&x->id.daddr, 0,
                                    (struct sockaddr *) (addr + 1),
                                    x->props.family);
-       if (!addr->sadb_address_prefixlen)
-               BUG();
+       BUG_ON(!addr->sadb_address_prefixlen);
 
        if (!xfrm_addr_equal(&x->sel.saddr, &x->props.saddr,
                             x->props.family)) {