|
@@ -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;
|