diff options
author | Jan Engelhardt <jengelh@medozas.de> | 2011-12-18 03:10:56 +0100 |
---|---|---|
committer | Jan Engelhardt <jengelh@medozas.de> | 2011-12-18 03:10:57 +0100 |
commit | 32a4b7dcaf252348732362cd6d853bf0005b2bdd (patch) | |
tree | a0cb75f98e4a09b75a8d51095f4a39769d778c74 /include/linux/netfilter/xt_policy.h | |
parent | b8c42eca0f224a00bf55b60ded81af14a1e07da1 (diff) | |
parent | 79ddbf202a06e6f018e087a328c2ca91e65a8463 (diff) |
Merge branch 'stable'
Diffstat (limited to 'include/linux/netfilter/xt_policy.h')
-rw-r--r-- | include/linux/netfilter/xt_policy.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/include/linux/netfilter/xt_policy.h b/include/linux/netfilter/xt_policy.h index be8ead05..d246eac8 100644 --- a/include/linux/netfilter/xt_policy.h +++ b/include/linux/netfilter/xt_policy.h @@ -26,30 +26,19 @@ 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 { -#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; __u32 reqid; |