Skip to content

Commit

Permalink
mac80211: let drivers not supporting channel contexts use VHT
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Karl Beldan authored and Johannes Berg committed Apr 8, 2013
1 parent 675a0b0 commit d0e6c21
Showing 1 changed file with 1 addition and 13 deletions.
14 changes: 1 addition & 13 deletions net/mac80211/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit d0e6c21

Please sign in to comment.