From 76bc19dedbd01b3ccfe33dbd02f2e5950cd9af25 Mon Sep 17 00:00:00 2001
From: "John W. Linville" <linville@tuxdriver.com>
Date: Wed, 22 Oct 2008 19:41:34 -0400
Subject: [PATCH] --- yaml --- r: 118074 b: refs/heads/master c:
 51b94bf0654a14600ff9706f7bc0f7685265f6cd h: refs/heads/master v: v3

---
 [refs]                                        | 2 +-
 trunk/net/mac80211/rc80211_minstrel_debugfs.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 0ece1a81b58a..7ec89c611ae9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d8b105f900d93bd103c002bf4c923f50f16c5441
+refs/heads/master: 51b94bf0654a14600ff9706f7bc0f7685265f6cd
diff --git a/trunk/net/mac80211/rc80211_minstrel_debugfs.c b/trunk/net/mac80211/rc80211_minstrel_debugfs.c
index 0b024cd6b809..98f480708050 100644
--- a/trunk/net/mac80211/rc80211_minstrel_debugfs.c
+++ b/trunk/net/mac80211/rc80211_minstrel_debugfs.c
@@ -94,8 +94,8 @@ minstrel_stats_open(struct inode *inode, struct file *file)
 				prob / 10, prob % 10,
 				mr->last_success,
 				mr->last_attempts,
-				mr->succ_hist,
-				mr->att_hist);
+				(unsigned long long)mr->succ_hist,
+				(unsigned long long)mr->att_hist);
 	}
 	p += sprintf(p, "\nTotal packet count::    ideal %d      "
 			"lookaround %d\n\n",
@@ -106,7 +106,7 @@ minstrel_stats_open(struct inode *inode, struct file *file)
 	return 0;
 }
 
-static int
+static ssize_t
 minstrel_stats_read(struct file *file, char __user *buf, size_t len, loff_t *o)
 {
 	struct minstrel_stats_info *ms;