X-Git-Url: http://www.project-moonshot.org/gitweb/?p=mech_eap.git;a=blobdiff_plain;f=libeap%2Fsrc%2Fp2p%2Fp2p_build.c;fp=libeap%2Fsrc%2Fp2p%2Fp2p_build.c;h=2882c6ad02e7eb85fff43224b8c2013d05fc95a1;hp=793d28ba7bdd2a20efbd84f385898fd4c9dc5b98;hb=d1dd9aae6741e74f20bfc35e1db598652680279d;hpb=bd3bd69af16ab99706ba70ed11a3e291e968e5c6

diff --git a/libeap/src/p2p/p2p_build.c b/libeap/src/p2p/p2p_build.c
index 793d28b..2882c6a 100644
--- a/libeap/src/p2p/p2p_build.c
+++ b/libeap/src/p2p/p2p_build.c
@@ -202,11 +202,11 @@ void p2p_buf_add_device_info(struct wpabuf *buf, struct p2p_data *p2p,
 	if (peer && peer->wps_method != WPS_NOT_READY) {
 		if (peer->wps_method == WPS_PBC)
 			methods |= WPS_CONFIG_PUSHBUTTON;
+		else if (peer->wps_method == WPS_P2PS)
+			methods |= WPS_CONFIG_P2PS;
 		else if (peer->wps_method == WPS_PIN_DISPLAY ||
-			 peer->wps_method == WPS_PIN_KEYPAD) {
+			 peer->wps_method == WPS_PIN_KEYPAD)
 			methods |= WPS_CONFIG_DISPLAY | WPS_CONFIG_KEYPAD;
-			methods |= WPS_CONFIG_P2PS;
-		}
 	} else if (p2p->cfg->config_methods) {
 		methods |= p2p->cfg->config_methods &
 			(WPS_CONFIG_PUSHBUTTON | WPS_CONFIG_DISPLAY |