Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[pandora-kernel.git] / include / net / ipcomp.h

diff --git a/include/net/ipcomp.h b/include/net/ipcomp.h
index 330b74e..cc4f30c 100644 (file)
--- a/include/net/ipcomp.h
+++ b/include/net/ipcomp.h
@@ -9,11 +9,17 @@ struct crypto_comp;
 
 struct ipcomp_data {
        u16 threshold;
-       struct crypto_comp **tfms;
+       struct crypto_comp * __percpu *tfms;
 };
 
 struct ip_comp_hdr;
 struct sk_buff;
+struct xfrm_state;
+
+int ipcomp_input(struct xfrm_state *x, struct sk_buff *skb);
+int ipcomp_output(struct xfrm_state *x, struct sk_buff *skb);
+void ipcomp_destroy(struct xfrm_state *x);
+int ipcomp_init_state(struct xfrm_state *x);
 
 static inline struct ip_comp_hdr *ip_comp_hdr(const struct sk_buff *skb)
 {