fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / include / linux / netfilter_ipv6 / ip6t_policy.h

diff --git a/include/linux/netfilter_ipv6/ip6t_policy.h b/include/linux/netfilter_ipv6/ip6t_policy.h
index 671bd81..6bab316 100644 (file)
--- a/include/linux/netfilter_ipv6/ip6t_policy.h
+++ b/include/linux/netfilter_ipv6/ip6t_policy.h
@@ -1,58 +1,21 @@
 #ifndef _IP6T_POLICY_H
 #define _IP6T_POLICY_H
 
-#define IP6T_POLICY_MAX_ELEM   4
-
-enum ip6t_policy_flags
-{
-       IP6T_POLICY_MATCH_IN            = 0x1,
-       IP6T_POLICY_MATCH_OUT           = 0x2,
-       IP6T_POLICY_MATCH_NONE          = 0x4,
-       IP6T_POLICY_MATCH_STRICT        = 0x8,
-};
-
-enum ip6t_policy_modes
-{
-       IP6T_POLICY_MODE_TRANSPORT,
-       IP6T_POLICY_MODE_TUNNEL
-};
-
-struct ip6t_policy_spec
-{
-       u_int8_t        saddr:1,
-                       daddr:1,
-                       proto:1,
-                       mode:1,
-                       spi:1,
-                       reqid:1;
-};
-
-union ip6t_policy_addr
-{
-       struct in_addr  a4;
-       struct in6_addr a6;
-};
-
-struct ip6t_policy_elem
-{
-       union ip6t_policy_addr  saddr;
-       union ip6t_policy_addr  smask;
-       union ip6t_policy_addr  daddr;
-       union ip6t_policy_addr  dmask;
-       u_int32_t               spi;
-       u_int32_t               reqid;
-       u_int8_t                proto;
-       u_int8_t                mode;
-
-       struct ip6t_policy_spec match;
-       struct ip6t_policy_spec invert;
-};
-
-struct ip6t_policy_info
-{
-       struct ip6t_policy_elem pol[IP6T_POLICY_MAX_ELEM];
-       u_int16_t flags;
-       u_int16_t len;
-};
+#define IP6T_POLICY_MAX_ELEM           XT_POLICY_MAX_ELEM
+
+/* ip6t_policy_flags */
+#define IP6T_POLICY_MATCH_IN           XT_POLICY_MATCH_IN
+#define IP6T_POLICY_MATCH_OUT          XT_POLICY_MATCH_OUT
+#define IP6T_POLICY_MATCH_NONE         XT_POLICY_MATCH_NONE
+#define IP6T_POLICY_MATCH_STRICT       XT_POLICY_MATCH_STRICT
+
+/* ip6t_policy_modes */
+#define IP6T_POLICY_MODE_TRANSPORT     XT_POLICY_MODE_TRANSPORT
+#define IP6T_POLICY_MODE_TUNNEL                XT_POLICY_MODE_TUNNEL
+
+#define ip6t_policy_spec               xt_policy_spec
+#define ip6t_policy_addr               xt_policy_addr
+#define ip6t_policy_elem               xt_policy_elem
+#define ip6t_policy_info               xt_policy_info
 
 #endif /* _IP6T_POLICY_H */