diff options
| author | Alexey Dobriyan <adobriyan@gmail.com> | 2010-02-10 15:00:32 +0100 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2010-02-10 15:00:32 +0100 |
| commit | 0a02604628c49037e1de2091d75462fd856b26ed (patch) | |
| tree | acf91566581f3076f63022375d0bd9ccdf18d611 /include | |
| parent | Merge branch 'master' of /repos/git/net-next-2.6 (diff) | |
| download | linux-0a02604628c49037e1de2091d75462fd856b26ed.tar.xz linux-0a02604628c49037e1de2091d75462fd856b26ed.zip | |
netfilter: xtables: consistent struct compat_xt_counters definition
There is compat_u64 type which deals with different u64 type alignment
on different compat-capable platforms, so use it and removed some
hardcoded assumptions.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/netfilter/x_tables.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h index 365fabe1b16e..8b6c0e7d2657 100644 --- a/include/linux/netfilter/x_tables.h +++ b/include/linux/netfilter/x_tables.h @@ -562,11 +562,7 @@ struct compat_xt_entry_target { * current task alignment */ struct compat_xt_counters { -#if defined(CONFIG_X86_64) || defined(CONFIG_IA64) - u_int32_t cnt[4]; -#else - u_int64_t cnt[2]; -#endif + compat_u64 pcnt, bcnt; /* Packet and byte counters */ }; struct compat_xt_counters_info { |