DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

P2P: Set p2p auth/assoc parameter based on connection type

Browse source 
Fix the previous code that was hardcoding the p2p parameter based
on the driver P2P capability regardless of whether the connection
was really used for P2P or not.
This commit is contained in:
Jouni Malinen 2011-07-17 20:52:49 +03:00
parent 2f4f73b154
commit ffad885837
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
wpa_supplicant/sme.c
View file

@ -227,12 +227,11 @@ void sme_authenticate(struct wpa_supplicant *wpa_s,
u8 *pos; u8 *pos;
size_t len; size_t len;
int res; int res;
int p2p_group;
p2p_group = wpa_s->drv_flags & WPA_DRIVER_FLAGS_P2P_CAPABLE;
pos = wpa_s->sme.assoc_req_ie + wpa_s->sme.assoc_req_ie_len; pos = wpa_s->sme.assoc_req_ie + wpa_s->sme.assoc_req_ie_len;
len = sizeof(wpa_s->sme.assoc_req_ie) - len = sizeof(wpa_s->sme.assoc_req_ie) -
wpa_s->sme.assoc_req_ie_len; wpa_s->sme.assoc_req_ie_len;
res = wpas_p2p_assoc_req_ie(wpa_s, bss, pos, len, p2p_group); res = wpas_p2p_assoc_req_ie(wpa_s, bss, pos, len,
ssid->p2p_group);
if (res >= 0) if (res >= 0)
wpa_s->sme.assoc_req_ie_len += res; wpa_s->sme.assoc_req_ie_len += res;
} }
@ -401,8 +400,7 @@ void sme_associate(struct wpa_supplicant *wpa_s, enum wpas_mode mode,
elems.wpa_ie_len + 2); elems.wpa_ie_len + 2);
else else
wpa_sm_set_assoc_wpa_ie(wpa_s->wpa, NULL, 0); wpa_sm_set_assoc_wpa_ie(wpa_s->wpa, NULL, 0);
if (elems.p2p && if (wpa_s->current_ssid && wpa_s->current_ssid->p2p_group)
(wpa_s->drv_flags & WPA_DRIVER_FLAGS_P2P_CAPABLE))
params.p2p = 1; params.p2p = 1;
if (wpa_s->parent->set_sta_uapsd) if (wpa_s->parent->set_sta_uapsd)

6
wpa_supplicant/wpa_supplicant.c
View file

@ -1348,11 +1348,7 @@ void wpa_supplicant_associate(struct wpa_supplicant *wpa_s,
} }
#endif /* CONFIG_IEEE80211W */ #endif /* CONFIG_IEEE80211W */
#ifdef CONFIG_P2P params.p2p = ssid->p2p_group;
if (wpa_s->global->p2p &&
(wpa_s->drv_flags & WPA_DRIVER_FLAGS_P2P_CAPABLE))
params.p2p = 1;
#endif /* CONFIG_P2P */
if (wpa_s->parent->set_sta_uapsd) if (wpa_s->parent->set_sta_uapsd)
params.uapsd = wpa_s->parent->sta_uapsd; params.uapsd = wpa_s->parent->sta_uapsd;