Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c4cb928 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211: print info when disabling HT 



Make mac80211 print a message when it disables
HT due to the connection using WEP/TKIP or due
to the AP not supporting WMM/QoS.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a8ce8544

net/mac80211/mlme.c

+10 −3
Original line number Diff line number Diff line
@@ -3317,11 +3317,15 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata, 
	 * We can set this to true for non-11n hardware, that'll be checked

	 * separately along with the peer capabilities.

	 */

	for (i = 0; i < req->crypto.n_ciphers_pairwise; i++)

	for (i = 0; i < req->crypto.n_ciphers_pairwise; i++) {

		if (req->crypto.ciphers_pairwise[i] == WLAN_CIPHER_SUITE_WEP40 ||

		    req->crypto.ciphers_pairwise[i] == WLAN_CIPHER_SUITE_TKIP ||

		    req->crypto.ciphers_pairwise[i] == WLAN_CIPHER_SUITE_WEP104)

		    req->crypto.ciphers_pairwise[i] == WLAN_CIPHER_SUITE_WEP104) {

			ifmgd->flags |= IEEE80211_STA_DISABLE_11N;

			netdev_info(sdata->dev,

				    "disabling HT due to WEP/TKIP use\n");

		}

	}



	if (req->flags & ASSOC_REQ_DISABLE_HT)

		ifmgd->flags |= IEEE80211_STA_DISABLE_11N;
@@ -3329,8 +3333,11 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata, 
	/* Also disable HT if we don't support it or the AP doesn't use WMM */

	sband = local->hw.wiphy->bands[req->bss->channel->band];

	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;

		netdev_info(sdata->dev,

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

	}



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

	memcpy(&ifmgd->ht_capa_mask, &req->ht_capa_mask,