From 71a7f5bdb1a367ef9d9d38f6e1fc4cccb851670e Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 17 Aug 2007 21:30:14 +0000 Subject: [PATCH] 2007-08-17 Dan Williams * src/nm-device-802-11-wireless.c - (device_cleanup): disconnect the interface in wpa_supplicant before we dispose of the interface proxy in NM git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2710 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 6 ++++++ src/nm-device-802-11-wireless.c | 9 ++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1e93a75d88..a8749762b1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-08-17 Dan Williams + + * src/nm-device-802-11-wireless.c + - (device_cleanup): disconnect the interface in wpa_supplicant before + we dispose of the interface proxy in NM + 2007-08-16 Dan Williams * libnm-glib/nm-client.c diff --git a/src/nm-device-802-11-wireless.c b/src/nm-device-802-11-wireless.c index 39928e8307..77f1692708 100644 --- a/src/nm-device-802-11-wireless.c +++ b/src/nm-device-802-11-wireless.c @@ -605,12 +605,11 @@ device_cleanup (NMDevice80211Wireless *self) cancel_pending_scan (self); - cleanup_supplicant_interface (self); - - if (priv->supplicant.iface) { + /* Tell the supplicant to disconnect from the current AP */ + if (priv->supplicant.iface) nm_supplicant_interface_disconnect (priv->supplicant.iface); - priv->supplicant.iface = NULL; - } + + cleanup_supplicant_interface (self); if (priv->supplicant.mgr_state_id) { g_signal_handler_disconnect (priv->supplicant.mgr, priv->supplicant.mgr_state_id);