From 2b200ca1b33d933d958b5e65ae4672e21996e0f1 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 7 Mar 2008 12:26:55 +0000 Subject: [PATCH] 2008-03-07 Dan Williams * src/nm-netlink.c - (nm_netlink_get_default_handle): NMNetlinkMonitor now uses libnl, don't need this hack any more (Benoit Boissinot) git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3384 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 6 ++++++ src/nm-netlink.c | 17 ----------------- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index e8e84d6b4d..e0fe6f64e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-03-07 Dan Williams + + * src/nm-netlink.c + - (nm_netlink_get_default_handle): NMNetlinkMonitor now uses libnl, + don't need this hack any more (Benoit Boissinot) + 2008-03-06 Dan Williams * autogen.sh diff --git a/src/nm-netlink.c b/src/nm-netlink.c index ecdb3db22e..71aa8eb6d7 100644 --- a/src/nm-netlink.c +++ b/src/nm-netlink.c @@ -70,23 +70,6 @@ nm_netlink_get_default_handle (void) 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; }