Fix wpas_notify_network_removed()

Commit bb3df9a569e4a33445c89ebc50019ba46b4f6704 ('notify: Do not raise
any signal from a P2P management interface') was supposed to only change
D-Bus behavior, but it ended up disabling non-D-Bus functionality as
well for some sequences where the P2P Device interface is used.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>

diff --git a/wpa_supplicant/notify.c b/wpa_supplicant/notify.c
index ea7dbdb15bf2475770d67242402ea46e5116201b..184a95c8b2e558420195306c4370e82cbe78c4fe 100644 (file)
--- a/wpa_supplicant/notify.c
+++ b/wpa_supplicant/notify.c
@@ -307,14 +307,12 @@ void wpas_notify_persistent_group_removed(struct wpa_supplicant *wpa_s,
 void wpas_notify_network_removed(struct wpa_supplicant *wpa_s,
                                 struct wpa_ssid *ssid)
 {
-       if (wpa_s->p2p_mgmt)
-               return;
-
        if (wpa_s->next_ssid == ssid)
                wpa_s->next_ssid = NULL;
        if (wpa_s->wpa)
                wpa_sm_pmksa_cache_flush(wpa_s->wpa, ssid);
-       if (!ssid->p2p_group && wpa_s->global->p2p_group_formation != wpa_s)
+       if (!ssid->p2p_group && wpa_s->global->p2p_group_formation != wpa_s &&
+           !wpa_s->p2p_mgmt)
                wpas_dbus_unregister_network(wpa_s, ssid->id);
        if (network_is_persistent_group(ssid))
                wpas_notify_persistent_group_removed(wpa_s, ssid);