commit 8a4157206df48bb4855273096a6d7eac2f54b24f
author Dmitry Shmidt <dimitrysh@google.com> Mon Nov 11 13:24:52 2013 -0800
committer Dmitry Shmidt <dimitrysh@google.com> Mon Nov 18 11:02:34 2013 -0800
tree e794bb984e6a3deec33cffd774e98c36cc1a9e7a
parent 7e6eef4d7cae2a3f6b49744844c20cce3dc2ef28

Android: Remove #ifdef ANDROID_P2P from wps_registrar_remove_pbc_session

Change-Id: Idcf738aca2e348b2c49bc41a63f90b084901f0ee
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

src/wps/wps_registrar.c

diff --git a/src/wps/wps_registrar.c b/src/wps/wps_registrar.c
index 7cb583c..ef17617 100644
--- a/src/wps/wps_registrar.c
+++ b/src/wps/wps_registrar.c
@@ -367,13 +367,8 @@
 	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;