From c2de0d98ba39e0a1a970d066fd19be786092f376 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 1 Mar 2016 16:55:22 +0100 Subject: Imported Upstream version 1.1.91 --- src/devices/adsl/nm-atm-manager.c | 3 +-- src/devices/adsl/nm-device-adsl.c | 10 ++-------- 2 files changed, 3 insertions(+), 10 deletions(-) (limited to 'src/devices/adsl') diff --git a/src/devices/adsl/nm-atm-manager.c b/src/devices/adsl/nm-atm-manager.c index d3f1423f..a3fa4901 100644 --- a/src/devices/adsl/nm-atm-manager.c +++ b/src/devices/adsl/nm-atm-manager.c @@ -18,13 +18,12 @@ * Copyright (C) 2009 - 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include #include #include -#include "nm-default.h" #include "nm-atm-manager.h" #include "nm-setting-adsl.h" #include "nm-device-adsl.h" diff --git a/src/devices/adsl/nm-device-adsl.c b/src/devices/adsl/nm-device-adsl.c index dd9a1203..e7a91e0a 100644 --- a/src/devices/adsl/nm-device-adsl.c +++ b/src/devices/adsl/nm-device-adsl.c @@ -18,7 +18,7 @@ * Pantelis Koukousoulas */ -#include "config.h" +#include "nm-default.h" #include #include @@ -32,7 +32,6 @@ #include #include -#include "nm-default.h" #include "nm-device-adsl.h" #include "nm-device-private.h" #include "nm-enum-types.h" @@ -449,7 +448,6 @@ act_stage3_ip4_config_start (NMDevice *device, { NMDeviceAdsl *self = NM_DEVICE_ADSL (device); NMDeviceAdslPrivate *priv = NM_DEVICE_ADSL_GET_PRIVATE (self); - NMConnection *connection; NMSettingAdsl *s_adsl; NMActRequest *req; GError *err = NULL; @@ -458,11 +456,7 @@ act_stage3_ip4_config_start (NMDevice *device, req = nm_device_get_act_request (device); g_assert (req); - - connection = nm_act_request_get_applied_connection (req); - g_assert (req); - - s_adsl = nm_connection_get_setting_adsl (connection); + s_adsl = (NMSettingAdsl *) nm_device_get_applied_setting (device, NM_TYPE_SETTING_ADSL); g_assert (s_adsl); /* PPPoE uses the NAS interface, not the ATM interface */ -- cgit 1.3.0-6-gf8a5