jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix wpas_notify_network_removed()

Browse source 
Commit bb3df9a569 ('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>
This commit is contained in:
Jouni Malinen 2015-04-29 20:47:14 +03:00 committed by Jouni Malinen
parent cb346b49d2
commit 5441da2beb
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
wpa_supplicant/notify.c
View file

@ -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, void wpas_notify_network_removed(struct wpa_supplicant *wpa_s,
struct wpa_ssid *ssid) struct wpa_ssid *ssid)
{ {
if (wpa_s->p2p_mgmt)
return;
if (wpa_s->next_ssid == ssid) if (wpa_s->next_ssid == ssid)
wpa_s->next_ssid = NULL; wpa_s->next_ssid = NULL;
if (wpa_s->wpa) if (wpa_s->wpa)
wpa_sm_pmksa_cache_flush(wpa_s->wpa, ssid); 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); wpas_dbus_unregister_network(wpa_s, ssid->id);
if (network_is_persistent_group(ssid)) if (network_is_persistent_group(ssid))
wpas_notify_persistent_group_removed(wpa_s, ssid); wpas_notify_persistent_group_removed(wpa_s, ssid);