Commit 1b49de26 authored by Johannes Berg's avatar Johannes Berg

mac80211: supress HT/VHT disable if not supported

If HT/VHT isn't supported by us we shouldn't print
a message that we disabled it, do that only if the
AP didn't support WMM and we therefore disable it.
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 36323f81
...@@ -3373,16 +3373,18 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata, ...@@ -3373,16 +3373,18 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata,
if (!sband->ht_cap.ht_supported || if (!sband->ht_cap.ht_supported ||
local->hw.queues < IEEE80211_NUM_ACS || !bss->wmm_used) { local->hw.queues < IEEE80211_NUM_ACS || !bss->wmm_used) {
ifmgd->flags |= IEEE80211_STA_DISABLE_11N; ifmgd->flags |= IEEE80211_STA_DISABLE_11N;
netdev_info(sdata->dev, if (!bss->wmm_used)
"disabling HT as WMM/QoS is not supported\n"); netdev_info(sdata->dev,
"disabling HT as WMM/QoS is not supported by the AP\n");
} }
/* disable VHT if we don't support it or the AP doesn't use WMM */ /* disable VHT if we don't support it or the AP doesn't use WMM */
if (!sband->vht_cap.vht_supported || if (!sband->vht_cap.vht_supported ||
local->hw.queues < IEEE80211_NUM_ACS || !bss->wmm_used) { local->hw.queues < IEEE80211_NUM_ACS || !bss->wmm_used) {
ifmgd->flags |= IEEE80211_STA_DISABLE_VHT; ifmgd->flags |= IEEE80211_STA_DISABLE_VHT;
netdev_info(sdata->dev, if (!bss->wmm_used)
"disabling VHT as WMM/QoS is not supported\n"); netdev_info(sdata->dev,
"disabling VHT as WMM/QoS is not supported by the AP\n");
} }
memcpy(&ifmgd->ht_capa, &req->ht_capa, sizeof(ifmgd->ht_capa)); memcpy(&ifmgd->ht_capa, &req->ht_capa, sizeof(ifmgd->ht_capa));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment