diff options
| author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2010-12-20 11:54:26 +0100 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2010-12-20 11:54:35 +0100 |
| commit | 57d871ad46bfaed44e556cb872f4bfab1004d9e1 (patch) | |
| tree | 05aba4c451f5d6a7025db633d22c556f55d9f351 /kernel/include/linux/netfilter/xt_set.h | |
| parent | 06366c172c487b3038b52e8fe640747b4092a544 (diff) | |
| parent | 95b9dfb393232f384ccfc671971a0a9387e138d4 (diff) | |
Merge branch 'master' of git://dev.medozas.de/ipset into ipset-5
Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Diffstat (limited to 'kernel/include/linux/netfilter/xt_set.h')
| -rw-r--r-- | kernel/include/linux/netfilter/xt_set.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kernel/include/linux/netfilter/xt_set.h b/kernel/include/linux/netfilter/xt_set.h index c6084df..69b2bd1 100644 --- a/kernel/include/linux/netfilter/xt_set.h +++ b/kernel/include/linux/netfilter/xt_set.h @@ -15,11 +15,11 @@ struct xt_set_info_v0 { ip_set_id_t index; union { - u_int32_t flags[IPSET_DIM_MAX + 1]; + __u32 flags[IPSET_DIM_MAX + 1]; struct { - u_int32_t __flags[IPSET_DIM_MAX]; - u_int8_t dim; - u_int8_t flags; + __u32 __flags[IPSET_DIM_MAX]; + __u8 dim; + __u8 flags; } compat; } u; }; @@ -38,8 +38,8 @@ struct xt_set_info_target_v0 { struct xt_set_info { ip_set_id_t index; - u_int8_t dim; - u_int8_t flags; + __u8 dim; + __u8 flags; }; /* match and target infos */ |