From 54f6333410ffd570e62717d9e77c5c987175e397 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 24 Dec 2015 00:24:58 +0100 Subject: Imported Upstream version 1.0.10 --- src/nm-iface-helper.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src/nm-iface-helper.c') diff --git a/src/nm-iface-helper.c b/src/nm-iface-helper.c index 18966c57..25bde8ed 100644 --- a/src/nm-iface-helper.c +++ b/src/nm-iface-helper.c @@ -327,7 +327,6 @@ int main (int argc, char *argv[]) { char *bad_domains = NULL; - gs_unref_object NMDhcpManager *dhcp_mgr = NULL; GError *error = NULL; gboolean wrote_pidfile = FALSE; gs_free char *pidfile = NULL; @@ -437,11 +436,7 @@ main (int argc, char *argv[]) if (global_opt.dhcp4_address) { nm_platform_sysctl_set (NM_PLATFORM_GET, nm_utils_ip4_property_path (global_opt.ifname, "promote_secondaries"), "1"); - /* Initialize DHCP manager */ - dhcp_mgr = nm_dhcp_manager_get (); - g_assert (dhcp_mgr != NULL); - - dhcp4_client = nm_dhcp_manager_start_ip4 (dhcp_mgr, + dhcp4_client = nm_dhcp_manager_start_ip4 (nm_dhcp_manager_get (), global_opt.ifname, ifindex, hwaddr, -- cgit 1.3.0-6-gf8a5