summaryrefslogtreecommitdiffstats
path: root/net/mac80211/main.c
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-05-13 16:48:03 +0200
committerJohn W. Linville <linville@tuxdriver.com>2010-06-02 16:12:59 -0400
commitec8aa669b8393b6789b1954d587c63264af7ff99 (patch)
tree1a4c43dc718262d1aa6256de2d50b9e03a76c604 /net/mac80211/main.c
parentb4df47081b67bce9dcb7b84b551588c7402a330a (diff)
downloadlinux-ec8aa669b8393b6789b1954d587c63264af7ff99.tar.gz
linux-ec8aa669b8393b6789b1954d587c63264af7ff99.tar.bz2
linux-ec8aa669b8393b6789b1954d587c63264af7ff99.zip
mac80211: add the minstrel_ht rate control algorithm
Signed-off-by: Felix Fietkau <nbd@openwrt.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/main.c')
-rw-r--r--net/mac80211/main.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 22a384dfab65..c8548e61f860 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -704,6 +704,10 @@ static int __init ieee80211_init(void)
if (ret)
return ret;
+ ret = rc80211_minstrel_ht_init();
+ if (ret)
+ goto err_minstrel;
+
ret = rc80211_pid_init();
if (ret)
goto err_pid;
@@ -716,6 +720,8 @@ static int __init ieee80211_init(void)
err_netdev:
rc80211_pid_exit();
err_pid:
+ rc80211_minstrel_ht_exit();
+ err_minstrel:
rc80211_minstrel_exit();
return ret;
@@ -724,6 +730,7 @@ static int __init ieee80211_init(void)
static void __exit ieee80211_exit(void)
{
rc80211_pid_exit();
+ rc80211_minstrel_ht_exit();
rc80211_minstrel_exit();
/*