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

Commit 070e176a authored by Arik Nemtsov's avatar Arik Nemtsov Committed by Johannes Berg
Browse files

mac80211: send HT/VHT IEs in TDLS discovery response 



These are mandated by IEEE802.11-2012 section 8.5.8.6 and IEEE802.11ac-2013
section 8.5.8.16.

Signed-off-by: default avatarArik Nemtsov <arikx.nemtsov@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent abcff6ef

net/mac80211/tdls.c

+8 −3
Original line number Diff line number Diff line
@@ -378,7 +378,9 @@ ieee80211_tdls_add_setup_start_ies(struct ieee80211_sub_if_data *sdata, 
	sband = local->hw.wiphy->bands[band];

	memcpy(&ht_cap, &sband->ht_cap, sizeof(ht_cap));



	if (action_code == WLAN_TDLS_SETUP_REQUEST && ht_cap.ht_supported) {

	if ((action_code == WLAN_TDLS_SETUP_REQUEST ||

	     action_code == WLAN_PUB_ACTION_TDLS_DISCOVER_RES) &&

	    ht_cap.ht_supported) {

		ieee80211_apply_htcap_overrides(sdata, &ht_cap);



		/* disable SMPS in TDLS initiator */
@@ -432,10 +434,13 @@ ieee80211_tdls_add_setup_start_ies(struct ieee80211_sub_if_data *sdata, 


	/* build the VHT-cap similarly to the HT-cap */

	memcpy(&vht_cap, &sband->vht_cap, sizeof(vht_cap));

	if (action_code == WLAN_TDLS_SETUP_REQUEST && vht_cap.vht_supported) {

	if ((action_code == WLAN_TDLS_SETUP_REQUEST ||

	     action_code == WLAN_PUB_ACTION_TDLS_DISCOVER_RES) &&

	    vht_cap.vht_supported) {

		ieee80211_apply_vhtcap_overrides(sdata, &vht_cap);



		/* the AID is present only when VHT is implemented */

		if (action_code == WLAN_TDLS_SETUP_REQUEST)

			ieee80211_tdls_add_aid(sdata, skb);



		pos = skb_put(skb, sizeof(struct ieee80211_vht_cap) + 2);