Merge branch 'hdrs-for-dump-req' into iproute2-next

[mirror_iproute2.git] / ip / xfrm.h

diff --git a/ip/xfrm.h b/ip/xfrm.h
index 773c92e99e9ef8e36c00578df4e8c4bf5354560c..71be574d90d86b50b0c1f39b03604bf6e5626124 100644 (file)
--- a/ip/xfrm.h
+++ b/ip/xfrm.h
@@ -26,16 +26,12 @@
 
 #include <stdio.h>
 #include <sys/socket.h>
+#include <linux/in.h>
 #include <linux/xfrm.h>
+#include <linux/ipsec.h>
 
-#ifndef IPPROTO_SCTP
-# define IPPROTO_SCTP  132
-#endif
-#ifndef IPPROTO_DCCP
-# define IPPROTO_DCCP  33
-#endif
 #ifndef IPPROTO_MH
-# define IPPROTO_MH    135
+#define IPPROTO_MH              135
 #endif
 
 #define XFRMS_RTA(x)  ((struct rtattr*)(((char*)(x)) + NLMSG_ALIGN(sizeof(struct xfrm_usersa_info))))
@@ -98,6 +94,7 @@ struct xfrm_filter {
        __u8 action_mask;
        __u32 priority_mask;
        __u8 policy_flags_mask;
+       __u8 filter_socket;
 
        __u8 ptype;
        __u8 ptype_mask;