---

yaml --- r: 108800 b: refs/heads/master c: 816f8b8 h: refs/heads/master v: v3
git-mirror · Aug 15, 2008 · 9dfe34f · 9dfe34f
1 parent b3dd26f
commit 9dfe34f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ba526ced990f4d61ee8d65fe8a6f0745e8e455c
+refs/heads/master: 816f8b86621000fc82e16ae5f172164de761d5eb
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
@@ -8466,6 +8466,11 @@ static inline unsigned long get_stat64(tg3_stat64_t *val)
 	return ret;
 }
 
+static inline u64 get_estat64(tg3_stat64_t *val)
+{
+       return ((u64)val->high << 32) | ((u64)val->low);
+}
+
 static unsigned long calc_crc_errors(struct tg3 *tp)
 {
 	struct tg3_hw_stats *hw_stats = tp->hw_stats;
@@ -8494,7 +8499,7 @@ static unsigned long calc_crc_errors(struct tg3 *tp)
 
 #define ESTAT_ADD(member) \
 	estats->member =	old_estats->member + \
-				get_stat64(&hw_stats->member)
+				get_estat64(&hw_stats->member)
 
 static struct tg3_ethtool_stats *tg3_get_estats(struct tg3 *tp)
 {