[XFRM] STATE: Allow non IPsec protocol.

[safe/jmp/linux-2.6] / include / net / xfrm.h

diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 5b364b0..2a7d213 100644 (file)
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -838,7 +838,10 @@ static inline int xfrm_state_kern(struct xfrm_state *x)
 
 static inline int xfrm_id_proto_match(u8 proto, u8 userproto)
 {
-       return (userproto == IPSEC_PROTO_ANY || proto == userproto);
+       return (!userproto || proto == userproto ||
+               (userproto == IPSEC_PROTO_ANY && (proto == IPPROTO_AH ||
+                                                 proto == IPPROTO_ESP ||
+                                                 proto == IPPROTO_COMP)));
 }
 
 /*