Skip to content

Commit

Permalink
minstrel: make the rate control ops reusable from another rc implemen…
Browse files Browse the repository at this point in the history
…tation

This patch makes it possible to reuse the minstrel rate control ops
from another rate control module. This is useful in preparing for the
new 802.11n implementation of minstrel, which will reuse the old code
for legacy stations.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Felix Fietkau authored and John W. Linville committed Mar 10, 2010
1 parent 44ac91e commit eae4475
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
2 changes: 1 addition & 1 deletion net/mac80211/rc80211_minstrel.c
Original file line number Diff line number Diff line change
Expand Up @@ -541,7 +541,7 @@ minstrel_free(void *priv)
kfree(priv);
}

static struct rate_control_ops mac80211_minstrel = {
struct rate_control_ops mac80211_minstrel = {
.name = "minstrel",
.tx_status = minstrel_tx_status,
.get_rate = minstrel_get_rate,
Expand Down
6 changes: 6 additions & 0 deletions net/mac80211/rc80211_minstrel.h
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,13 @@ struct minstrel_debugfs_info {
char buf[];
};

extern struct rate_control_ops mac80211_minstrel;
void minstrel_add_sta_debugfs(void *priv, void *priv_sta, struct dentry *dir);
void minstrel_remove_sta_debugfs(void *priv, void *priv_sta);

/* debugfs */
int minstrel_stats_open(struct inode *inode, struct file *file);
ssize_t minstrel_stats_read(struct file *file, char __user *buf, size_t len, loff_t *ppos);
int minstrel_stats_release(struct inode *inode, struct file *file);

#endif
6 changes: 3 additions & 3 deletions net/mac80211/rc80211_minstrel_debugfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
#include <net/mac80211.h>
#include "rc80211_minstrel.h"

static int
int
minstrel_stats_open(struct inode *inode, struct file *file)
{
struct minstrel_sta_info *mi = inode->i_private;
Expand Down Expand Up @@ -100,7 +100,7 @@ minstrel_stats_open(struct inode *inode, struct file *file)
return 0;
}

static ssize_t
ssize_t
minstrel_stats_read(struct file *file, char __user *buf, size_t len, loff_t *ppos)
{
struct minstrel_debugfs_info *ms;
Expand All @@ -109,7 +109,7 @@ minstrel_stats_read(struct file *file, char __user *buf, size_t len, loff_t *ppo
return simple_read_from_buffer(buf, len, ppos, ms->buf, ms->len);
}

static int
int
minstrel_stats_release(struct inode *inode, struct file *file)
{
kfree(file->private_data);
Expand Down

0 comments on commit eae4475

Please sign in to comment.