mac80211: let drivers not supporting channel contexts use VHT

It is possible since the global hw config and local switched to
cfg80211_chan_def.

Signed-off-by: Karl Beldan <karl.beldan@rivierawaves.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

1 files changed, 1 insertions, 13 deletions

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index a16b037c9d34..52136fd5ba97 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -840,22 +840,10 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
         if (supp_ht)
                 local->scan_ies_len += 2 + sizeof(struct ieee80211_ht_cap);
 
-        if (supp_vht) {
+        if (supp_vht)
                 local->scan_ies_len +=
                         2 + sizeof(struct ieee80211_vht_cap);
 
-                /*
-                 * (for now at least), drivers wanting to use VHT must
-                 * support channel contexts, as they contain all the
-                 * necessary VHT information and the global hw config
-                 * doesn't (yet)
-                 */
-                if (WARN_ON(!local->use_chanctx)) {
-                        result = -EINVAL;
-                        goto fail_wiphy_register;
-                }
-        }
-
         if (!local->ops->hw_scan) {
                 /* For hw_scan, driver needs to set these up. */
                 local->hw.wiphy->max_scan_ssids = 4;