Piteball
/
android_kernel_samsung_msm8976
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

minstrel: simplify and fix debugfs code 

This patch cleans up the debugfs read function for the statistics by
using simple_read_from_buffer instead of its own semi-broken hack.
Also removes a useless member of the minstrel debugfs info struct.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Felix Fietkau 2010-03-01 22:17:38 +01:00 committed by John W. Linville
parent 8127fbdc41
commit 44ac91ea84
2 changed files with 11 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/mac80211/rc80211_minstrel.h
View File

@ -80,6 +80,11 @@ struct minstrel_priv {
unsigned int lookaround_rate_mrr;
};
struct minstrel_debugfs_info {
size_t len;
char buf[];
};
void minstrel_add_sta_debugfs(void *priv, void *priv_sta, struct dentry *dir);
void minstrel_remove_sta_debugfs(void *priv, void *priv_sta);

35
net/mac80211/rc80211_minstrel_debugfs.c
View File

@ -52,21 +52,15 @@
#include <net/mac80211.h>
#include "rc80211_minstrel.h"
struct minstrel_stats_info {
struct minstrel_sta_info *mi;
char buf[4096];
size_t len;
};
static int
minstrel_stats_open(struct inode *inode, struct file *file)
{
struct minstrel_sta_info *mi = inode->i_private;
struct minstrel_stats_info *ms;
struct minstrel_debugfs_info *ms;
unsigned int i, tp, prob, eprob;
char *p;
ms = kmalloc(sizeof(*ms), GFP_KERNEL);
ms = kmalloc(sizeof(*ms) + 4096, GFP_KERNEL);
if (!ms)
return -ENOMEM;
@ -107,35 +101,18 @@ minstrel_stats_open(struct inode *inode, struct file *file)
}
static ssize_t
minstrel_stats_read(struct file *file, char __user *buf, size_t len, loff_t *o)
minstrel_stats_read(struct file *file, char __user *buf, size_t len, loff_t *ppos)
{
struct minstrel_stats_info *ms;
char *src;
struct minstrel_debugfs_info *ms;
ms = file->private_data;
src = ms->buf;
len = min(len, ms->len);
if (len <= *o)
return 0;
src += *o;
len -= *o;
*o += len;
if (copy_to_user(buf, src, len))
return -EFAULT;
return len;
return simple_read_from_buffer(buf, len, ppos, ms->buf, ms->len);
}
static int
minstrel_stats_release(struct inode *inode, struct file *file)
{
struct minstrel_stats_info *ms = file->private_data;
kfree(ms);
kfree(file->private_data);
return 0;
}