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

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

net/mac80211/mlme.c

+6 −4
Original line number Diff line number Diff line
@@ -3373,16 +3373,18 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata, 
	if (!sband->ht_cap.ht_supported ||

	    local->hw.queues < IEEE80211_NUM_ACS || !bss->wmm_used) {

		ifmgd->flags |= IEEE80211_STA_DISABLE_11N;

		if (!bss->wmm_used)

			netdev_info(sdata->dev,

			    "disabling HT as WMM/QoS is not supported\n");

				    "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 */

	if (!sband->vht_cap.vht_supported ||

	    local->hw.queues < IEEE80211_NUM_ACS || !bss->wmm_used) {

		ifmgd->flags |= IEEE80211_STA_DISABLE_VHT;

		if (!bss->wmm_used)

			netdev_info(sdata->dev,

			    "disabling VHT as WMM/QoS is not supported\n");

				    "disabling VHT as WMM/QoS is not supported by the AP\n");

	}



	memcpy(&ifmgd->ht_capa, &req->ht_capa, sizeof(ifmgd->ht_capa));