diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2007-10-28 14:51:05 +0100 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-11-11 06:59:54 +0100 |
| commit | 830f903866a1611e9ce53f3e35202302bb938946 (patch) | |
| tree | c1e6d73661aedd19bb3ef356fa14685389bfb082 | |
| parent | mac80211: don't allow registering the same rate control twice (diff) | |
| download | linux-830f903866a1611e9ce53f3e35202302bb938946.tar.xz linux-830f903866a1611e9ce53f3e35202302bb938946.zip | |
mac80211: allow driver to ask for a rate control algorithm
This allows a driver to ask for a specific rate control algorithm.
The rate control algorithm asked for must be registered and be
available as a module or built-in.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | include/net/mac80211.h | 5 | ||||
| -rw-r--r-- | net/mac80211/ieee80211.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 5fcc4c104340..f13c378fde91 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -706,11 +706,16 @@ enum ieee80211_hw_flags { * * @queues: number of available hardware transmit queues for * data packets. WMM/QoS requires at least four. + * + * @rate_control_algorithm: rate control algorithm for this hardware. + * If unset (NULL), the default algorithm will be used. Must be + * set before calling ieee80211_register_hw(). */ struct ieee80211_hw { struct ieee80211_conf conf; struct wiphy *wiphy; struct workqueue_struct *workqueue; + const char *rate_control_algorithm; void *priv; u32 flags; unsigned int extra_tx_headroom; diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c index 52ba6ef90685..e0ee65a969bc 100644 --- a/net/mac80211/ieee80211.c +++ b/net/mac80211/ieee80211.c @@ -1072,7 +1072,8 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) ieee80211_debugfs_add_netdev(IEEE80211_DEV_TO_SUB_IF(local->mdev)); ieee80211_if_set_type(local->mdev, IEEE80211_IF_TYPE_AP); - result = ieee80211_init_rate_ctrl_alg(local, NULL); + result = ieee80211_init_rate_ctrl_alg(local, + hw->rate_control_algorithm); if (result < 0) { printk(KERN_DEBUG "%s: Failed to initialize rate control " "algorithm\n", wiphy_name(local->hw.wiphy)); |