aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJan Engelhardt <jengelh@computergmbh.de>2008-01-15 02:42:06 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:02:25 -0500
commit917b6fbd6e8dd952c64d1d7468897160467d2cc0 (patch)
treef06c669f94bfec8a193583028b166ae20f16cfda /include
parent57de0abbffa9724e2a89860a49725d805bfc07ca (diff)
[NETFILTER]: xt_policy: use the new union nf_inet_addr
Signed-off-by: Jan Engelhardt <jengelh@computergmbh.de> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r--include/linux/netfilter/xt_policy.h23
1 files changed, 19 insertions, 4 deletions
diff --git a/include/linux/netfilter/xt_policy.h b/include/linux/netfilter/xt_policy.h
index 45654d359a68..053d8cc65464 100644
--- a/include/linux/netfilter/xt_policy.h
+++ b/include/linux/netfilter/xt_policy.h
@@ -27,18 +27,33 @@ struct xt_policy_spec
27 reqid:1; 27 reqid:1;
28}; 28};
29 29
30#ifndef __KERNEL__
30union xt_policy_addr 31union xt_policy_addr
31{ 32{
32 struct in_addr a4; 33 struct in_addr a4;
33 struct in6_addr a6; 34 struct in6_addr a6;
34}; 35};
36#endif
35 37
36struct xt_policy_elem 38struct xt_policy_elem
37{ 39{
38 union xt_policy_addr saddr; 40 union {
39 union xt_policy_addr smask; 41#ifdef __KERNEL__
40 union xt_policy_addr daddr; 42 struct {
41 union xt_policy_addr dmask; 43 union nf_inet_addr saddr;
44 union nf_inet_addr smask;
45 union nf_inet_addr daddr;
46 union nf_inet_addr dmask;
47 };
48#else
49 struct {
50 union xt_policy_addr saddr;
51 union xt_policy_addr smask;
52 union xt_policy_addr daddr;
53 union xt_policy_addr dmask;
54 };
55#endif
56 };
42 __be32 spi; 57 __be32 spi;
43 u_int32_t reqid; 58 u_int32_t reqid;
44 u_int8_t proto; 59 u_int8_t proto;