summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2008-10-22 19:41:34 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-10-27 17:46:11 -0400
commit51b94bf0654a14600ff9706f7bc0f7685265f6cd (patch)
tree3d83105b7c5403d9bc90f4e94023dfb246250e6e /net
parentd8b105f900d93bd103c002bf4c923f50f16c5441 (diff)
downloadlinux-stable-51b94bf0654a14600ff9706f7bc0f7685265f6cd.tar.gz
linux-stable-51b94bf0654a14600ff9706f7bc0f7685265f6cd.tar.bz2
linux-stable-51b94bf0654a14600ff9706f7bc0f7685265f6cd.zip
mac80211: correct warnings in minstrel rate control algorithm
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/rc80211_minstrel_debugfs.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/mac80211/rc80211_minstrel_debugfs.c b/net/mac80211/rc80211_minstrel_debugfs.c
index 0b024cd6b809..98f480708050 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;