| commit | 0c865a7045cbede009e3ec512388d69c6b1b81c1 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Sep 30 18:54:18 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 30 18:54:18 2021 +0000 |
| tree | 23d691aff266488493dfe844720b0f2e3c5d7950 | |
| parent | e74e6986e64152b7189d5216a20803666273e2ae [diff] | |
| parent | b551791ccf9fe2dbe0467cc0489beae17fcc5d57 [diff] |
Merge "Fix wpa_supplicant build with newer BoringSSL" am: 96e84352e6 am: 12405a05cf am: b551791ccf Original change: https://android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/1835013 Change-Id: Ic3c9be25b35c5a3b9c4680a635040277a4605124
diff --git a/hostapd/hidl/1.3/hostapd.cpp b/hostapd/hidl/1.3/hostapd.cpp index 6add761..f9d2647 100644 --- a/hostapd/hidl/1.3/hostapd.cpp +++ b/hostapd/hidl/1.3/hostapd.cpp
@@ -879,8 +879,8 @@ // Invoke the failure callback on all registered // clients. for (const auto& callback : callbacks_) { - callback->onFailure( - iface_hapd->conf->iface); + callback->onFailure(strlen(iface_hapd->conf->bridge) > 0 ? + iface_hapd->conf->bridge : iface_hapd->conf->iface); } } };
diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c index ff3a964..3471b99 100644 --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c
@@ -6694,7 +6694,7 @@ struct wpa_global *global = wpa_s->global; struct wpa_supplicant *iface, *prev; - if (wpa_s == wpa_s->parent) + if (wpa_s == wpa_s->parent || (wpa_s == wpa_s->p2pdev && wpa_s->p2p_mgmt)) wpas_p2p_group_remove(wpa_s, "*"); iface = global->ifaces;