Merge changes I01c09b4d,I0a524cdb,I378fcfc4
* changes:
Android: Remove changing oper_freq in p2p_process_go_neg_conf()
Revert setting wpa_s->conf->ap_scan = DEFAULT_AP_SCAN
Revert "Allow immediate scan request even if another scan was scheduled later"
diff --git a/src/p2p/p2p_go_neg.c b/src/p2p/p2p_go_neg.c
index 50d6e36..7eaa8dc 100644
--- a/src/p2p/p2p_go_neg.c
+++ b/src/p2p/p2p_go_neg.c
@@ -1145,16 +1145,6 @@
}
}
-#ifdef ANDROID_P2P
- if (msg.operating_channel) {
- dev->oper_freq = p2p_channel_to_freq(msg.operating_channel[3],
- msg.operating_channel[4]);
- p2p_dbg(p2p, "P2P: Peer operating channel preference: %d MHz",
- dev->oper_freq);
- } else
- dev->oper_freq = 0;
-#endif
-
if (!msg.channel_list) {
p2p_dbg(p2p, "Mandatory Operating Channel attribute missing from GO Negotiation Confirmation");
#ifdef CONFIG_P2P_STRICT
diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
index daabecb..9a5ee1a 100644
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -160,9 +160,6 @@
return;
wpa_supplicant_set_state(wpa_s, WPA_DISCONNECTED);
-#ifdef ANDROID
- wpa_s->conf->ap_scan = DEFAULT_AP_SCAN;
-#endif
bssid_changed = !is_zero_ether_addr(wpa_s->bssid);
os_memset(wpa_s->bssid, 0, ETH_ALEN);
os_memset(wpa_s->pending_bssid, 0, ETH_ALEN);