jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

TDLS: Use WMM IE for propagating peer WMM capability

Browse source 
Relying on qos qosinfo is not enough, as it can be 0 for WMM enabled
peers that don't support U-APSD. Further, some peers don't even contain
this IE (Google Nexus 5), but do contain the WMM IE during setup.

Signed-off-by: Arik Nemtsov <arikx.nemtsov@intel.com>
This commit is contained in:
Arik Nemtsov 2014-09-29 20:47:53 +02:00 committed by Jouni Malinen
parent 17729b0985
commit 08d7665c6b
4 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/rsn_supp/tdls.c
View file

@ -1721,8 +1721,8 @@ static int wpa_tdls_addset_peer(struct wpa_sm *sm, struct wpa_tdls_peer *peer,
peer->supp_rates, peer->supp_rates_len, peer->supp_rates, peer->supp_rates_len,
peer->ht_capabilities, peer->ht_capabilities,
peer->vht_capabilities, peer->vht_capabilities,
peer->qos_info, peer->ext_capab, peer->qos_info, peer->wmm_capable,
peer->ext_capab_len, peer->ext_capab, peer->ext_capab_len,
peer->supp_channels, peer->supp_channels,
peer->supp_channels_len, peer->supp_channels_len,
peer->supp_oper_classes, peer->supp_oper_classes,
@ -1867,7 +1867,7 @@ static int wpa_tdls_process_tpk_m1(struct wpa_sm *sm, const u8 *src_addr,
"TDLS setup - send own request"); "TDLS setup - send own request");
peer->initiator = 1; peer->initiator = 1;
wpa_sm_tdls_peer_addset(sm, peer->addr, 1, 0, 0, NULL, 0, NULL, wpa_sm_tdls_peer_addset(sm, peer->addr, 1, 0, 0, NULL, 0, NULL,
NULL, 0, NULL, 0, NULL, 0, NULL, 0); NULL, 0, 0, NULL, 0, NULL, 0, NULL, 0);
wpa_tdls_send_tpk_m1(sm, peer); wpa_tdls_send_tpk_m1(sm, peer);
} }
@ -2605,7 +2605,7 @@ int wpa_tdls_start(struct wpa_sm *sm, const u8 *addr)
/* add the peer to the driver as a "setup in progress" peer */ /* add the peer to the driver as a "setup in progress" peer */
if (wpa_sm_tdls_peer_addset(sm, peer->addr, 1, 0, 0, NULL, 0, NULL, if (wpa_sm_tdls_peer_addset(sm, peer->addr, 1, 0, 0, NULL, 0, NULL,
NULL, 0, NULL, 0, NULL, 0, NULL, 0)) { NULL, 0, 0, NULL, 0, NULL, 0, NULL, 0)) {
wpa_tdls_disable_peer_link(sm, peer); wpa_tdls_disable_peer_link(sm, peer);
return -1; return -1;
} }

2
src/rsn_supp/wpa.h
View file

@ -62,7 +62,7 @@ struct wpa_sm_ctx {
size_t supp_rates_len, size_t supp_rates_len,
const struct ieee80211_ht_capabilities *ht_capab, const struct ieee80211_ht_capabilities *ht_capab,
const struct ieee80211_vht_capabilities *vht_capab, const struct ieee80211_vht_capabilities *vht_capab,
u8 qosinfo, const u8 *ext_capab, u8 qosinfo, int wmm, const u8 *ext_capab,
size_t ext_capab_len, const u8 *supp_channels, size_t ext_capab_len, const u8 *supp_channels,
size_t supp_channels_len, size_t supp_channels_len,
const u8 *supp_oper_classes, const u8 *supp_oper_classes,

8
src/rsn_supp/wpa_i.h
View file

@ -293,16 +293,16 @@ wpa_sm_tdls_peer_addset(struct wpa_sm *sm, const u8 *addr, int add,
size_t supp_rates_len, size_t supp_rates_len,
const struct ieee80211_ht_capabilities *ht_capab, const struct ieee80211_ht_capabilities *ht_capab,
const struct ieee80211_vht_capabilities *vht_capab, const struct ieee80211_vht_capabilities *vht_capab,
u8 qosinfo, const u8 *ext_capab, size_t ext_capab_len, u8 qosinfo, int wmm, const u8 *ext_capab,
const u8 *supp_channels, size_t supp_channels_len, size_t ext_capab_len, const u8 *supp_channels,
const u8 *supp_oper_classes, size_t supp_channels_len, const u8 *supp_oper_classes,
size_t supp_oper_classes_len) size_t supp_oper_classes_len)
{ {
if (sm->ctx->tdls_peer_addset) if (sm->ctx->tdls_peer_addset)
return sm->ctx->tdls_peer_addset(sm->ctx->ctx, addr, add, return sm->ctx->tdls_peer_addset(sm->ctx->ctx, addr, add,
aid, capability, supp_rates, aid, capability, supp_rates,
supp_rates_len, ht_capab, supp_rates_len, ht_capab,
vht_capab, qosinfo, vht_capab, qosinfo, wmm,
ext_capab, ext_capab_len, ext_capab, ext_capab_len,
supp_channels, supp_channels,
supp_channels_len, supp_channels_len,

8
wpa_supplicant/wpas_glue.c
View file

@ -602,7 +602,7 @@ static int wpa_supplicant_tdls_peer_addset(
const u8 *supp_rates, size_t supp_rates_len, const u8 *supp_rates, size_t supp_rates_len,
const struct ieee80211_ht_capabilities *ht_capab, const struct ieee80211_ht_capabilities *ht_capab,
const struct ieee80211_vht_capabilities *vht_capab, const struct ieee80211_vht_capabilities *vht_capab,
u8 qosinfo, const u8 *ext_capab, size_t ext_capab_len, u8 qosinfo, int wmm, const u8 *ext_capab, size_t ext_capab_len,
const u8 *supp_channels, size_t supp_channels_len, const u8 *supp_channels, size_t supp_channels_len,
const u8 *supp_oper_classes, size_t supp_oper_classes_len) const u8 *supp_oper_classes, size_t supp_oper_classes_len)
{ {
@ -617,10 +617,10 @@ static int wpa_supplicant_tdls_peer_addset(
params.flags = WPA_STA_TDLS_PEER | WPA_STA_AUTHORIZED; params.flags = WPA_STA_TDLS_PEER | WPA_STA_AUTHORIZED;
/* /*
* TDLS Setup frames do not contain WMM IEs, hence need to depend on * Don't rely only on qosinfo for WMM capability. It may be 0 even when
* qosinfo to check if the peer is WMM capable. * present. Allow the WMM IE to also indicate QoS support.
*/ */
if (qosinfo) if (wmm || qosinfo)
params.flags |= WPA_STA_WMM; params.flags |= WPA_STA_WMM;
params.ht_capabilities = ht_capab; params.ht_capabilities = ht_capab;