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_u32.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_u32.h')
| -rw-r--r-- | include/linux/netfilter/xt_u32.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/linux/netfilter/xt_u32.h b/include/linux/netfilter/xt_u32.h index 9947f56cdbdd..e8c3d8722bae 100644 --- a/include/linux/netfilter/xt_u32.h +++ b/include/linux/netfilter/xt_u32.h @@ -9,13 +9,13 @@ enum xt_u32_ops { }; struct xt_u32_location_element { - u_int32_t number; - u_int8_t nextop; + __u32 number; + __u8 nextop; }; struct xt_u32_value_element { - u_int32_t min; - u_int32_t max; + __u32 min; + __u32 max; }; /* @@ -27,14 +27,14 @@ struct xt_u32_value_element { struct xt_u32_test { struct xt_u32_location_element location[XT_U32_MAXSIZE+1]; struct xt_u32_value_element value[XT_U32_MAXSIZE+1]; - u_int8_t nnums; - u_int8_t nvalues; + __u8 nnums; + __u8 nvalues; }; struct xt_u32 { struct xt_u32_test tests[XT_U32_MAXSIZE+1]; - u_int8_t ntests; - u_int8_t invert; + __u8 ntests; + __u8 invert; }; #endif /* _XT_U32_H */ |