From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 22 Oct 2008 23:41:34 +0000 (-0400)
Subject: mac80211: correct warnings in minstrel rate control algorithm
X-Git-Tag: v2.6.28-rc3~48^2~6
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=51b94bf0654a14600ff9706f7bc0f7685265f6cd;p=linux-2.6-omap-h63xx.git

mac80211: correct warnings in minstrel rate control algorithm

Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/net/mac80211/rc80211_minstrel_debugfs.c b/net/mac80211/rc80211_minstrel_debugfs.c
index 0b024cd6b80..98f48070805 100644
--- a/net/mac80211/rc80211_minstrel_debugfs.c
+++ b/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;