From: Alexey Dobriyan <adobriyan@gmail.com>
Date: Wed, 10 Feb 2010 14:00:32 +0000 (+0100)
Subject: netfilter: xtables: consistent struct compat_xt_counters definition
X-Git-Tag: MMI-PSA29.97-13-9~24841^2~154^2~34
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0a02604628c49037e1de2091d75462fd856b26ed;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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>
---

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 {