P2P: Advertize cross connection to WLAN AP on a non-P2P interface

Commit 1c2aa04c96 ('P2P: Do not add P2P
IEs on P2P disabled interface') removed the P2P IEs from association on
non-P2P interface. However, an AP functioning as a P2P manager needs the
cross connection capability of the station (P2P Device). This needs to
be done to meet the P2P specification requirements even if the station
interface has p2p_disabled=1 in case P2P in general is enabled.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Sunil Dutt 2015-05-09 14:55:03 +05:30 committed by Jouni Malinen
parent 7d2736795a
commit d63f1419b5

View file

@ -5950,7 +5950,11 @@ int wpas_p2p_assoc_req_ie(struct wpa_supplicant *wpa_s, struct wpa_bss *bss,
if (wpa_s->global->p2p_disabled) if (wpa_s->global->p2p_disabled)
return -1; return -1;
if (wpa_s->conf->p2p_disabled) /*
* Advertize mandatory cross connection capability even on
* p2p_disabled=1 interface when associating with a P2P Manager WLAN AP.
*/
if (wpa_s->conf->p2p_disabled && p2p_group)
return -1; return -1;
if (wpa_s->global->p2p == NULL) if (wpa_s->global->p2p == NULL)
return -1; return -1;