[prev in list] [next in list] [prev in thread] [next in thread] 

List:       moblin-commits
Subject:    [Moblin-Commits] network-manager: Changes to 'master'
From:       rajib () moblin ! org (Rajyalakshmi Bommaraju)
Date:       2008-04-25 11:06:40
Message-ID: 20080425180637.F3EB71E74001 () moblin ! org
[Download RAW message or body]

 debian/changelog     |    6 ++++++
 src/NetworkManager.c |    2 ++
 2 files changed, 8 insertions(+), 0 deletions(-)

New commits:
commit 8a29ac5e83cbcb430ee53c38ebe578645f602201
Author: Raji Bommaraju <rajyalakshmi.bommaraju@intel.com>
Date:   Fri Apr 25 18:58:20 2008 -0700

    Bug fix for 211212


Diff in this email is a maximum of 400 lines.
diff --git a/debian/changelog b/debian/changelog
index 07d54b2..945fc5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+network-manager (0.6.5-1moblin4) gaston; urgency=low
+
+  *Fixed Deadlock in NetworkManager.c, launchpad bugfix for 211212 
+
+ -- Raji Bommaraju <rajyalakshmi.bommaraju@intel.com>  Fri, 25 Apr 2008 18:56:20 -0700
+
 network-manager (0.6.5-1moblin3) gaston; urgency=low
 
   *Fixing build failure
diff --git a/src/NetworkManager.c b/src/NetworkManager.c
index 1849c0d..34f4632 100644
--- a/src/NetworkManager.c
+++ b/src/NetworkManager.c
@@ -173,7 +173,9 @@ void nm_remove_device (NMData *data, NMDevice *dev)
 	g_return_if_fail (dev != NULL);
 
 	nm_device_set_removed (dev, TRUE);
+	nm_unlock_mutex (data->dev_list_mutex, __FUNCTION__);
 	nm_device_stop (dev);
+	nm_lock_mutex (data->dev_list_mutex, __FUNCTION__);
 	nm_dbus_schedule_device_status_change_signal (data, dev, NULL, DEVICE_REMOVED);
 
 	g_object_unref (G_OBJECT (dev));

[prev in list] [next in list] [prev in thread] [next in thread]