NetworkManager r3384 - in trunk: . src

[dcbw svn gnome org]

Author: dcbw
Date: Fri Mar  7 12:26:55 2008
New Revision: 3384
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3384&view=rev

Log:
2008-03-07  Dan Williams  <dcbw redhat com>

	* src/nm-netlink.c
		- (nm_netlink_get_default_handle): NMNetlinkMonitor now uses libnl,
			don't need this hack any more (Benoit Boissinot)



Modified:
   trunk/ChangeLog
   trunk/src/nm-netlink.c

Modified: trunk/src/nm-netlink.c
==============================================================================
--- trunk/src/nm-netlink.c	(original)
+++ trunk/src/nm-netlink.c	Fri Mar  7 12:26:55 2008
@@ -70,23 +70,6 @@
 		return NULL;
 	}
 
-	if (nl_connect (def_nl_handle, NETLINK_ROUTE) < 0) {
-		/* HACK: try one more time. Because the netlink monitor for link state
-		 * inits before we get here, it grabs the port that matches the PID
-		 * of the NM process, which also happens to be the PID that libnl uses
-		 * the first time too.  The real fix is to convert nm-netlink-monitor.c
-		 * over to use libnl.
-		 */
-		nl_handle_destroy (def_nl_handle);
-		def_nl_handle = NULL;
-
-		def_nl_handle = nm_netlink_get_default_handle ();
-		if (!def_nl_handle) {
-			nm_error ("couldn't connect to netlink: %s", nl_geterror ());
-			return NULL;
-		}
-	}
-
 	return def_nl_handle;
 }