drm: merge Linux master into HEAD

[linux-2.6-omap-h63xx.git] / include / net / ipcomp.h

diff --git a/include/net/ipcomp.h b/include/net/ipcomp.h
index 87c1af3e5e8243be480e0cec57860242c722a914..2a1092abaa078c790a5203887e503b3278b02245 100644 (file)
--- a/include/net/ipcomp.h
+++ b/include/net/ipcomp.h
@@ -1,14 +1,29 @@
 #ifndef _NET_IPCOMP_H
 #define _NET_IPCOMP_H
 
-#include <linux/crypto.h>
 #include <linux/types.h>
 
 #define IPCOMP_SCRATCH_SIZE     65400
 
+struct crypto_comp;
+
 struct ipcomp_data {
        u16 threshold;
        struct crypto_comp **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)
+{
+       return (struct ip_comp_hdr *)skb_transport_header(skb);
+}
+
 #endif