Revert "Cumulative patch from commit 4ec1fd8e42bad9390f14a58225b6e5f6fb691950"
This reverts commit 78a5dac804c22aa6e4ec8226a864d3b0d6ccddbb.
Test: None
diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c
index cd2fba3..996b4e8 100644
--- a/src/p2p/p2p.c
+++ b/src/p2p/p2p.c
@@ -2822,7 +2822,6 @@
}
p2p->p2ps_adv_list = NULL;
- p2ps_prov_free(p2p);
p2p_dbg(p2p, "All ASP advertisements flushed");
}
@@ -3023,8 +3022,6 @@
os_free(p2p->after_scan_tx);
p2p->after_scan_tx = NULL;
p2p->ssid_set = 0;
- p2ps_prov_free(p2p);
- p2p_reset_pending_pd(p2p);
}
diff --git a/src/p2p/p2p.h b/src/p2p/p2p.h
index 7b18dcf..5b5a0bf 100644
--- a/src/p2p/p2p.h
+++ b/src/p2p/p2p.h
@@ -2285,7 +2285,7 @@
* discovery (p2p_find). A random number of 100 TU units is picked for each
* Listen state iteration from [min_disc_int,max_disc_int] range.
*
- * max_disc_tu can be used to further limit the discoverable duration. However,
+ * max_disc_tu can be used to futher limit the discoverable duration. However,
* it should be noted that use of this parameter is not recommended since it
* would not be compliant with the P2P specification.
*/
diff --git a/src/p2p/p2p_pd.c b/src/p2p/p2p_pd.c
index 3994ec0..93a0535 100644
--- a/src/p2p/p2p_pd.c
+++ b/src/p2p/p2p_pd.c
@@ -1163,9 +1163,6 @@
msg.group_id, msg.group_id_len);
}
- if (reject != P2P_SC_FAIL_INFO_CURRENTLY_UNAVAILABLE)
- p2ps_prov_free(p2p);
-
if (reject == P2P_SC_SUCCESS) {
switch (config_methods) {
case WPS_CONFIG_DISPLAY:
@@ -1584,7 +1581,7 @@
report_config_methods);
if (p2p->state == P2P_PD_DURING_FIND) {
- p2p_stop_listen_for_freq(p2p, 0);
+ p2p_clear_timeout(p2p);
p2p_continue_find(p2p);
}
}