netfilter: xtables: consistent struct compat_xt_counters definition
authorAlexey Dobriyan <adobriyan@gmail.com>
Wed, 10 Feb 2010 14:00:32 +0000 (15:00 +0100)
committerPatrick McHardy <kaber@trash.net>
Wed, 10 Feb 2010 14:00:32 +0000 (15:00 +0100)
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>
include/linux/netfilter/x_tables.h

index 365fabe..8b6c0e7 100644 (file)
@@ -562,11 +562,7 @@ struct compat_xt_entry_target {
  * current task alignment */
 
 struct compat_xt_counters {
  * 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 {
 };
 
 struct compat_xt_counters_info {