[PATCH] mac80211: correct warnings in minstrel rate control algorithm

[PATCH] mac80211: correct warnings in minstrel rate control algorithm

[John W. Linville]

Signed-off-by: John W. Linville <linville@tuxdriver.com>
---
 net/mac80211/rc80211_minstrel_debugfs.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/mac80211/rc80211_minstrel_debugfs.c b/net/mac80211/rc80211_minstrel_debugfs.c
index 0b024cd..98f4807 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;
-- 
1.5.5.1

Re: [PATCH] mac80211: correct warnings in minstrel rate control algorithm

[Johannes Berg]

[-- Attachment #1: Type: text/plain, Size: 1230 bytes --]

Thanks, somehow I thought Felix had already posted that. Must've been
wishful thinking ;)

On Wed, 2008-10-22 at 19:41 -0400, John W. Linville wrote:
> Signed-off-by: John W. Linville <linville@tuxdriver.com>
> ---
>  net/mac80211/rc80211_minstrel_debugfs.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/net/mac80211/rc80211_minstrel_debugfs.c b/net/mac80211/rc80211_minstrel_debugfs.c
> index 0b024cd..98f4807 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;

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]