Merge branch 'upstream-merged'

1 files changed, 29 insertions, 0 deletions

diff --git a/libdde_linux26/contrib/include/net/ipcomp.h b/libdde_linux26/contrib/include/net/ipcomp.h
new file mode 100644
index 00000000..2a1092ab
--- /dev/null
+++ b/libdde_linux26/contrib/include/net/ipcomp.h
@@ -0,0 +1,29 @@
+#ifndef _NET_IPCOMP_H
+#define _NET_IPCOMP_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