diff options
| author | Jan Engelhardt | 2008-01-15 08:42:06 +0100 |
|---|---|---|
| committer | David S. Miller | 2008-01-29 00:02:25 +0100 |
| commit | 917b6fbd6e8dd952c64d1d7468897160467d2cc0 (patch) | |
| tree | f06c669f94bfec8a193583028b166ae20f16cfda /include/linux/netfilter/xt_policy.h | |
| parent | [NETFILTER]: xt_pkttype: IPv6 multicast address recognition (diff) | |
| download | kernel-qcow2-linux-917b6fbd6e8dd952c64d1d7468897160467d2cc0.tar.gz kernel-qcow2-linux-917b6fbd6e8dd952c64d1d7468897160467d2cc0.tar.xz kernel-qcow2-linux-917b6fbd6e8dd952c64d1d7468897160467d2cc0.zip | |
[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/linux/netfilter/xt_policy.h')
| -rw-r--r-- | include/linux/netfilter/xt_policy.h | 23 |
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 reqid:1; }; +#ifndef __KERNEL__ union xt_policy_addr { struct in_addr a4; struct in6_addr a6; }; +#endif struct xt_policy_elem { - union xt_policy_addr saddr; - union xt_policy_addr smask; - union xt_policy_addr daddr; - union xt_policy_addr dmask; + union { +#ifdef __KERNEL__ + struct { + union nf_inet_addr saddr; + union nf_inet_addr smask; + union nf_inet_addr daddr; + union nf_inet_addr dmask; + }; +#else + struct { + union xt_policy_addr saddr; + union xt_policy_addr smask; + union xt_policy_addr daddr; + union xt_policy_addr dmask; + }; +#endif + }; __be32 spi; u_int32_t reqid; u_int8_t proto; |