diff options
author | David S. Miller <davem@davemloft.net> | 2011-01-20 00:06:15 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-01-20 00:06:15 -0800 |
commit | a07aa004c8d814a975b1a68afdb7baaa8f1b91d5 (patch) | |
tree | 652edc2dce9732a64780b9e332034b6567631a8b /include/linux/netfilter/xt_TPROXY.h | |
parent | net_sched: cleanups (diff) | |
parent | netfilter: xtables: remove extraneous header that slipped in (diff) | |
download | linux-dev-a07aa004c8d814a975b1a68afdb7baaa8f1b91d5.tar.xz linux-dev-a07aa004c8d814a975b1a68afdb7baaa8f1b91d5.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
Diffstat (limited to 'include/linux/netfilter/xt_TPROXY.h')
-rw-r--r-- | include/linux/netfilter/xt_TPROXY.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/netfilter/xt_TPROXY.h b/include/linux/netfilter/xt_TPROXY.h index 3f3d69361289..8097e0b4c15e 100644 --- a/include/linux/netfilter/xt_TPROXY.h +++ b/include/linux/netfilter/xt_TPROXY.h @@ -5,15 +5,15 @@ * redirection. We can get rid of that whenever we get support for * mutliple targets in the same rule. */ struct xt_tproxy_target_info { - u_int32_t mark_mask; - u_int32_t mark_value; + __u32 mark_mask; + __u32 mark_value; __be32 laddr; __be16 lport; }; struct xt_tproxy_target_info_v1 { - u_int32_t mark_mask; - u_int32_t mark_value; + __u32 mark_mask; + __u32 mark_value; union nf_inet_addr laddr; __be16 lport; }; |