summaryrefslogtreecommitdiffstats
path: root/include/linux/netfilter/xt_policy.h
diff options
context:
space:
mode:
authorJan Engelhardt <jengelh@medozas.de>2010-01-31 22:42:52 +0100
committerJan Engelhardt <jengelh@medozas.de>2010-02-01 01:17:29 +0100
commit350661a6eb089f3e54e67e022db9e16ea280499f (patch)
treee6857b58f535bab42e2381f7fbb027f4cc9aa63a /include/linux/netfilter/xt_policy.h
parent028ad9ec6d5c27c107c9a7a316617cbe366abb0f (diff)
includes: header updates
Update the shipped Linux kernel headers from 2.6.33-rc6, as iptables's ipt_ECN.h for example references ipt_DSCP.h, which no longer exists. Since a number of old code pieces have been removed in the kernel in that fashion, the structs for older versions are moved into the .c file, to keep header updating simple. Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Diffstat (limited to 'include/linux/netfilter/xt_policy.h')
-rw-r--r--include/linux/netfilter/xt_policy.h32
1 files changed, 14 insertions, 18 deletions
diff --git a/include/linux/netfilter/xt_policy.h b/include/linux/netfilter/xt_policy.h
index 303e3804..d246eac8 100644
--- a/include/linux/netfilter/xt_policy.h
+++ b/include/linux/netfilter/xt_policy.h
@@ -1,25 +1,24 @@
#ifndef _XT_POLICY_H
#define _XT_POLICY_H
+#include <linux/types.h>
+
#define XT_POLICY_MAX_ELEM 4
-enum xt_policy_flags
-{
+enum xt_policy_flags {
XT_POLICY_MATCH_IN = 0x1,
XT_POLICY_MATCH_OUT = 0x2,
XT_POLICY_MATCH_NONE = 0x4,
XT_POLICY_MATCH_STRICT = 0x8,
};
-enum xt_policy_modes
-{
+enum xt_policy_modes {
XT_POLICY_MODE_TRANSPORT,
XT_POLICY_MODE_TUNNEL
};
-struct xt_policy_spec
-{
- u_int8_t saddr:1,
+struct xt_policy_spec {
+ __u8 saddr:1,
daddr:1,
proto:1,
mode:1,
@@ -27,14 +26,12 @@ struct xt_policy_spec
reqid:1;
};
-union xt_policy_addr
-{
+union xt_policy_addr {
struct in_addr a4;
struct in6_addr a6;
};
-struct xt_policy_elem
-{
+struct xt_policy_elem {
union {
struct {
union xt_policy_addr saddr;
@@ -44,19 +41,18 @@ struct xt_policy_elem
};
};
__be32 spi;
- u_int32_t reqid;
- u_int8_t proto;
- u_int8_t mode;
+ __u32 reqid;
+ __u8 proto;
+ __u8 mode;
struct xt_policy_spec match;
struct xt_policy_spec invert;
};
-struct xt_policy_info
-{
+struct xt_policy_info {
struct xt_policy_elem pol[XT_POLICY_MAX_ELEM];
- u_int16_t flags;
- u_int16_t len;
+ __u16 flags;
+ __u16 len;
};
#endif /* _XT_POLICY_H */