xfrm: Add SHA384 and SHA512 HMAC authentication algorithms to XFRM

[safe/jmp/linux-2.6] / net / xfrm / xfrm_ipcomp.c

diff --git a/net/xfrm/xfrm_ipcomp.c b/net/xfrm/xfrm_ipcomp.c
index 800f669..42cd183 100644 (file)
--- a/net/xfrm/xfrm_ipcomp.c
+++ b/net/xfrm/xfrm_ipcomp.c
@@ -22,7 +22,6 @@
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/percpu.h>
-#include <linux/rtnetlink.h>
 #include <linux/smp.h>
 #include <linux/vmalloc.h>
 #include <net/ip.h>
@@ -64,7 +63,6 @@ static int ipcomp_decompress(struct xfrm_state *x, struct sk_buff *skb)
        if (len > skb_tailroom(skb))
                len = skb_tailroom(skb);
 
-       skb->truesize += len;
        __skb_put(skb, len);
 
        len += plen;
@@ -251,7 +249,7 @@ static void ipcomp_free_tfms(struct crypto_comp **tfms)
                        break;
        }
 
-       BUG_TRAP(pos);
+       WARN_ON(!pos);
 
        if (--pos->users)
                return;