diff options
author | Felix Fietkau <nbd@nbd.name> | 2018-10-06 19:35:01 +0200 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2018-10-11 16:01:01 +0200 |
commit | b1c4f68337fa6b7c09154bb2bf2ec6f0d30ab652 (patch) | |
tree | 1a9e09fa489aaeaced52b91b46a2cd6e5cdc6cad /net/mac80211/main.c | |
parent | 5b5e87314efb558f2ff4b027b4d1ba386893e908 (diff) | |
download | linux-stable-b1c4f68337fa6b7c09154bb2bf2ec6f0d30ab652.tar.gz linux-stable-b1c4f68337fa6b7c09154bb2bf2ec6f0d30ab652.tar.bz2 linux-stable-b1c4f68337fa6b7c09154bb2bf2ec6f0d30ab652.zip |
mac80211: minstrel: merge with minstrel_ht, always enable VHT support
Legacy-only devices are not very common and the overhead of the extra
code for HT and VHT rates is not big enough to justify all those extra
lines of code to make it optional.
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/main.c')
-rw-r--r-- | net/mac80211/main.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index e6375d035355..83e71e6b2ebe 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -1375,18 +1375,12 @@ static int __init ieee80211_init(void) if (ret) return ret; - ret = rc80211_minstrel_ht_init(); - if (ret) - goto err_minstrel; - ret = ieee80211_iface_init(); if (ret) goto err_netdev; return 0; err_netdev: - rc80211_minstrel_ht_exit(); - err_minstrel: rc80211_minstrel_exit(); return ret; @@ -1394,7 +1388,6 @@ static int __init ieee80211_init(void) static void __exit ieee80211_exit(void) { - rc80211_minstrel_ht_exit(); rc80211_minstrel_exit(); ieee80211s_stop(); |