diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-31 03:17:34 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-31 03:17:34 -0400 |
| commit | a1744d3bee19d3b9cbfb825ab316a101b9c9f109 (patch) | |
| tree | c0e2324c09beca0eb5782eb5abf241ea2b7a4a11 /net/mac80211 | |
| parent | 275f165fa970174f8a98205529750e8abb6c0a33 (diff) | |
| parent | a432226614c5616e3cfd211e0acffa0acfb4770c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/p54/p54common.c
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | 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 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) | |||
| 94 | prob / 10, prob % 10, | 94 | prob / 10, prob % 10, |
| 95 | mr->last_success, | 95 | mr->last_success, |
| 96 | mr->last_attempts, | 96 | mr->last_attempts, |
| 97 | mr->succ_hist, | 97 | (unsigned long long)mr->succ_hist, |
| 98 | mr->att_hist); | 98 | (unsigned long long)mr->att_hist); |
| 99 | } | 99 | } |
| 100 | p += sprintf(p, "\nTotal packet count:: ideal %d " | 100 | p += sprintf(p, "\nTotal packet count:: ideal %d " |
| 101 | "lookaround %d\n\n", | 101 | "lookaround %d\n\n", |
| @@ -106,7 +106,7 @@ minstrel_stats_open(struct inode *inode, struct file *file) | |||
| 106 | return 0; | 106 | return 0; |
| 107 | } | 107 | } |
| 108 | 108 | ||
| 109 | static int | 109 | static ssize_t |
| 110 | minstrel_stats_read(struct file *file, char __user *buf, size_t len, loff_t *o) | 110 | minstrel_stats_read(struct file *file, char __user *buf, size_t len, loff_t *o) |
| 111 | { | 111 | { |
| 112 | struct minstrel_stats_info *ms; | 112 | struct minstrel_stats_info *ms; |