diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-05-01 01:22:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-05-01 01:22:05 +0000 |
| commit | bd9d83deac1d48774c732e5d2843716e8537aba8 (patch) | |
| tree | 623e6095dd6630dd7f50ef31e8a1bdf908db1d8b | |
| parent | d2928971124cdf469b41a7e4b4f0016fd7aaa04b (diff) | |
| parent | c4809957e763a1a73f7d813561b3a987fc720ccb (diff) | |
| download | wpa_supplicant_8-bd9d83deac1d48774c732e5d2843716e8537aba8.tar.gz | |
Merge "[wpa_supplicant] Fix merge error that broke VtsHalWifiSupplicantP2pV1_0Target" into qt-dev
| -rw-r--r-- | wpa_supplicant/notify.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/wpa_supplicant/notify.c b/wpa_supplicant/notify.c index bd4b8ae2..41dc3341 100644 --- a/wpa_supplicant/notify.c +++ b/wpa_supplicant/notify.c @@ -60,30 +60,28 @@ void wpas_notify_supplicant_deinitialized(struct wpa_global *global) int wpas_notify_iface_added(struct wpa_supplicant *wpa_s) { - if (wpa_s->p2p_mgmt) - return 0; + if (!wpa_s->p2p_mgmt) { + if (wpas_dbus_register_interface(wpa_s)) + return -1; + } /* HIDL interface wants to keep track of the P2P mgmt iface. */ if (wpas_hidl_register_interface(wpa_s)) return -1; - if (wpas_dbus_register_interface(wpa_s)) - return -1; - return 0; } void wpas_notify_iface_removed(struct wpa_supplicant *wpa_s) { - if (wpa_s->p2p_mgmt) - return; + if (!wpa_s->p2p_mgmt) { + /* unregister interface in new DBus ctrl iface */ + wpas_dbus_unregister_interface(wpa_s); + } /* HIDL interface wants to keep track of the P2P mgmt iface. */ wpas_hidl_unregister_interface(wpa_s); - - /* unregister interface in new DBus ctrl iface */ - wpas_dbus_unregister_interface(wpa_s); } |