---

yaml --- r: 106134 b: refs/heads/master c: 6fccab6 h: refs/heads/master v: v3
git-mirror · Jul 25, 2008 · aff493f · aff493f
1 parent 75502ec
commit aff493f
Show file tree

Hide file tree

Showing 9 changed files with 378 additions and 607 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cffe1c5d7a5a1e54f7c2c6d0510f651a965bccc3
+refs/heads/master: 6fccab671f2f0a24b799f29a4ec878f62d34656c
diff --git a/trunk/include/net/ipcomp.h b/trunk/include/net/ipcomp.h
@@ -14,6 +14,12 @@ struct ipcomp_data {
 
 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)
 {

diff --git a/trunk/net/ipv4/Kconfig b/trunk/net/ipv4/Kconfig
@@ -356,10 +356,8 @@ config INET_ESP
 
 config INET_IPCOMP
 	tristate "IP: IPComp transformation"
-	select XFRM
 	select INET_XFRM_TUNNEL
-	select CRYPTO
-	select CRYPTO_DEFLATE
+	select XFRM_IPCOMP
 	---help---
 	  Support for IP Payload Compression Protocol (IPComp) (RFC3173),
 	  typically needed for IPsec.