aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/main.c
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-05-13 10:48:03 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-06-02 16:12:59 -0400
commitec8aa669b8393b6789b1954d587c63264af7ff99 (patch)
tree1a4c43dc718262d1aa6256de2d50b9e03a76c604 /net/mac80211/main.c
parentb4df47081b67bce9dcb7b84b551588c7402a330a (diff)
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)
704 if (ret) 704 if (ret)
705 return ret; 705 return ret;
706 706
707 ret = rc80211_minstrel_ht_init();
708 if (ret)
709 goto err_minstrel;
710
707 ret = rc80211_pid_init(); 711 ret = rc80211_pid_init();
708 if (ret) 712 if (ret)
709 goto err_pid; 713 goto err_pid;
@@ -716,6 +720,8 @@ static int __init ieee80211_init(void)
716 err_netdev: 720 err_netdev:
717 rc80211_pid_exit(); 721 rc80211_pid_exit();
718 err_pid: 722 err_pid:
723 rc80211_minstrel_ht_exit();
724 err_minstrel:
719 rc80211_minstrel_exit(); 725 rc80211_minstrel_exit();
720 726
721 return ret; 727 return ret;
@@ -724,6 +730,7 @@ static int __init ieee80211_init(void)
724static void __exit ieee80211_exit(void) 730static void __exit ieee80211_exit(void)
725{ 731{
726 rc80211_pid_exit(); 732 rc80211_pid_exit();
733 rc80211_minstrel_ht_exit();
727 rc80211_minstrel_exit(); 734 rc80211_minstrel_exit();
728 735
729 /* 736 /*