* [PATCH] mac80211: send HT/VHT IEs in TDLS discovery response
@ 2015-03-30 8:16 Emmanuel Grumbach
2015-03-30 8:49 ` Johannes Berg
0 siblings, 1 reply; 2+ messages in thread
From: Emmanuel Grumbach @ 2015-03-30 8:16 UTC (permalink / raw)
To: johannes; +Cc: linux-wireless, Arik Nemtsov, Arik Nemtsov, Emmanuel Grumbach
From: Arik Nemtsov <arik@wizery.com>
These are mandated by IEEE802.11-2012 section 8.5.8.6 and IEEE802.11ac-2013
section 8.5.8.16.
Signed-off-by: Arik Nemtsov <arikx.nemtsov@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---
net/mac80211/tdls.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/net/mac80211/tdls.c b/net/mac80211/tdls.c
index 79ed59a..fff0d86 100644
--- a/net/mac80211/tdls.c
+++ b/net/mac80211/tdls.c
@@ -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,11 +434,14 @@ 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 */
- ieee80211_tdls_add_aid(sdata, skb);
+ if (action_code == WLAN_TDLS_SETUP_REQUEST)
+ ieee80211_tdls_add_aid(sdata, skb);
pos = skb_put(skb, sizeof(struct ieee80211_vht_cap) + 2);
ieee80211_ie_build_vht_cap(pos, &vht_cap, vht_cap.cap);
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] mac80211: send HT/VHT IEs in TDLS discovery response
2015-03-30 8:16 [PATCH] mac80211: send HT/VHT IEs in TDLS discovery response Emmanuel Grumbach
@ 2015-03-30 8:49 ` Johannes Berg
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Berg @ 2015-03-30 8:49 UTC (permalink / raw)
To: Emmanuel Grumbach; +Cc: linux-wireless, Arik Nemtsov, Arik Nemtsov
On Mon, 2015-03-30 at 11:16 +0300, Emmanuel Grumbach wrote:
> From: Arik Nemtsov <arik@wizery.com>
>
> These are mandated by IEEE802.11-2012 section 8.5.8.6 and IEEE802.11ac-2013
> section 8.5.8.16.
Applied.
johannes
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-03-30 8:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-03-30 8:16 [PATCH] mac80211: send HT/VHT IEs in TDLS discovery response Emmanuel Grumbach
2015-03-30 8:49 ` Johannes Berg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).