aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant/notify.c
diff options
context:
space:
mode:
authorJouni Malinen <jouni@qca.qualcomm.com>2015-04-29 17:47:14 (GMT)
committerJouni Malinen <j@w1.fi>2015-04-29 17:51:14 (GMT)
commit5441da2beb99c67e4f7790b114c65a2cc748f166 (patch)
tree0427230858f09265573b5b26b2e99eb787beab7a /wpa_supplicant/notify.c
parentcb346b49d2f05c2b4623e87e4f137ba3ec4c53d6 (diff)
downloadhostap-5441da2beb99c67e4f7790b114c65a2cc748f166.zip
hostap-5441da2beb99c67e4f7790b114c65a2cc748f166.tar.gz
hostap-5441da2beb99c67e4f7790b114c65a2cc748f166.tar.bz2
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>
Diffstat (limited to 'wpa_supplicant/notify.c')
-rw-r--r--wpa_supplicant/notify.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/wpa_supplicant/notify.c b/wpa_supplicant/notify.c
index ea7dbdb..184a95c 100644
--- 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);