diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2010-02-10 09:00:32 -0500 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2010-02-10 09:00:32 -0500 |
commit | 0a02604628c49037e1de2091d75462fd856b26ed (patch) | |
tree | acf91566581f3076f63022375d0bd9ccdf18d611 | |
parent | 9ab99d5a43e9f283738fd9fd365539306d13eaac (diff) |
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>
-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 { | |||
562 | * current task alignment */ | 562 | * current task alignment */ |
563 | 563 | ||
564 | struct compat_xt_counters { | 564 | struct compat_xt_counters { |
565 | #if defined(CONFIG_X86_64) || defined(CONFIG_IA64) | 565 | compat_u64 pcnt, bcnt; /* Packet and byte counters */ |
566 | u_int32_t cnt[4]; | ||
567 | #else | ||
568 | u_int64_t cnt[2]; | ||
569 | #endif | ||
570 | }; | 566 | }; |
571 | 567 | ||
572 | struct compat_xt_counters_info { | 568 | struct compat_xt_counters_info { |