diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2018-08-31 11:31:18 +0300 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2018-09-05 10:03:14 +0200 |
| commit | 7eb26df2972504ffe37da77612c0e5f714f0d6df (patch) | |
| tree | 4c3044951104f8765a40e55ae651072f90a10473 /net/mac80211/mlme.c | |
| parent | 09b4a4faf9d037990ac4f8110dd944b27b42d5df (diff) | |
| download | linux-7eb26df2972504ffe37da77612c0e5f714f0d6df.tar.gz linux-7eb26df2972504ffe37da77612c0e5f714f0d6df.tar.bz2 linux-7eb26df2972504ffe37da77612c0e5f714f0d6df.zip | |
mac80211: add ability to parse CCFS2
With newer VHT implementations, it's necessary to look at the
HT operation's CCFS2 field to identify the actual bandwidth
used.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/mlme.c')
| -rw-r--r-- | net/mac80211/mlme.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 3dbecae4be73..764a0f8e1dd1 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -220,7 +220,8 @@ ieee80211_determine_chantype(struct ieee80211_sub_if_data *sdata, memcpy(&he_oper_vht_cap, he_oper->optional, 3); he_oper_vht_cap.basic_mcs_set = cpu_to_le16(0); - if (!ieee80211_chandef_vht_oper(&he_oper_vht_cap, + if (!ieee80211_chandef_vht_oper(&sdata->local->hw, + &he_oper_vht_cap, ht_oper, &vht_chandef)) { if (!(ifmgd->flags & IEEE80211_STA_DISABLE_HE)) sdata_info(sdata, @@ -228,7 +229,8 @@ ieee80211_determine_chantype(struct ieee80211_sub_if_data *sdata, ret = IEEE80211_STA_DISABLE_HE; goto out; } - } else if (!ieee80211_chandef_vht_oper(vht_oper, &vht_chandef)) { + } else if (!ieee80211_chandef_vht_oper(&sdata->local->hw, vht_oper, + ht_oper, &vht_chandef)) { if (!(ifmgd->flags & IEEE80211_STA_DISABLE_VHT)) sdata_info(sdata, "AP VHT information is invalid, disable VHT\n"); |