aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2012-08-09 19:48:02 (GMT)
committerJouni Malinen <j@w1.fi>2012-08-09 20:18:32 (GMT)
commit9acddf36e2eaa727d5c0bfce7224f1e5023f1ddb (patch)
treeef84c7c522b438e11fd233f5940b665b57081a93
parent62c3fd97ff4dab810c6f94ca023cd4e51522cbb6 (diff)
downloadhostap-9acddf36e2eaa727d5c0bfce7224f1e5023f1ddb.zip
hostap-9acddf36e2eaa727d5c0bfce7224f1e5023f1ddb.tar.gz
hostap-9acddf36e2eaa727d5c0bfce7224f1e5023f1ddb.tar.bz2
AOSP: go_neg_req_sent
-rw-r--r--src/p2p/p2p.c7
-rw-r--r--src/p2p/p2p_go_neg.c3
2 files changed, 10 insertions, 0 deletions
diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c
index 09c0878..f19b3f6 100644
--- a/src/p2p/p2p.c
+++ b/src/p2p/p2p.c
@@ -2744,12 +2744,19 @@ static void p2p_go_neg_req_cb(struct p2p_data *p2p, int success)
}
if (success) {
+#ifndef ANDROID_P2P
dev->go_neg_req_sent++;
+#endif
if (dev->flags & P2P_DEV_USER_REJECTED) {
p2p_set_state(p2p, P2P_IDLE);
return;
}
}
+#ifdef ANDROID_P2P
+ else {
+ dev->go_neg_req_sent--;
+ }
+#endif
if (!success &&
(dev->info.dev_capab & P2P_DEV_CAPAB_CLIENT_DISCOVERABILITY) &&
diff --git a/src/p2p/p2p_go_neg.c b/src/p2p/p2p_go_neg.c
index 1a0c7d4..6e818c2 100644
--- a/src/p2p/p2p_go_neg.c
+++ b/src/p2p/p2p_go_neg.c
@@ -203,6 +203,9 @@ int p2p_connect_send(struct p2p_data *p2p, struct p2p_device *dev)
p2p->go_neg_peer = dev;
dev->flags |= P2P_DEV_WAIT_GO_NEG_RESPONSE;
dev->connect_reqs++;
+#ifdef ANDROID_P2P
+ dev->go_neg_req_sent++;
+#endif
if (p2p_send_action(p2p, freq, dev->info.p2p_device_addr,
p2p->cfg->dev_addr, dev->info.p2p_device_addr,
wpabuf_head(req), wpabuf_len(req), 200) < 0) {