From: Jouni Malinen <j@w1.fi>
Date: Thu, 9 Aug 2012 19:55:12 +0000 (+0300)
Subject: AOSP: WPS registrar PBC check for P2P interface addr
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ab9ff376956757de6175cce27f6f95c61c79a951;p=thirdparty%2Fhostap.git

AOSP: WPS registrar PBC check for P2P interface addr
---

diff --git a/src/wps/wps_registrar.c b/src/wps/wps_registrar.c
index 85ec3172f..5ed7ea4ac 100644
--- a/src/wps/wps_registrar.c
+++ b/src/wps/wps_registrar.c
@@ -312,8 +312,13 @@ static void wps_registrar_remove_pbc_session(struct wps_registrar *reg,
 	pbc = reg->pbc_sessions;
 	while (pbc) {
 		if (os_memcmp(pbc->uuid_e, uuid_e, WPS_UUID_LEN) == 0 ||
+#ifdef ANDROID_P2P
+		    (p2p_dev_addr && !is_zero_ether_addr(pbc->addr) &&
+		     os_memcmp(pbc->addr, p2p_dev_addr, ETH_ALEN) ==
+#else
 		    (p2p_dev_addr && !is_zero_ether_addr(reg->p2p_dev_addr) &&
 		     os_memcmp(reg->p2p_dev_addr, p2p_dev_addr, ETH_ALEN) ==
+#endif
 		     0)) {
 			if (prev)
 				prev->next = pbc->next;