diff options
| author | Michael Biebl <biebl@debian.org> | 2016-03-01 16:56:10 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-03-01 16:56:10 +0100 |
| commit | e62b307a9dd108e664aa507355ed3dd15a9c6d67 (patch) | |
| tree | 2957d1a0dde11be8bd9f506f8b075d21b85da2d0 /src/devices/adsl | |
| parent | de39787fedbff438bd933c30675fc5c026db6aa0 (diff) | |
| parent | c2de0d98ba39e0a1a970d066fd19be786092f376 (diff) | |
Merge tag 'upstream/1.1.91'
Upstream version 1.1.91
Diffstat (limited to 'src/devices/adsl')
| -rw-r--r-- | src/devices/adsl/nm-atm-manager.c | 3 | ||||
| -rw-r--r-- | src/devices/adsl/nm-device-adsl.c | 10 |
2 files changed, 3 insertions, 10 deletions
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 <string.h> #include <gudev/gudev.h> #include <gmodule.h> -#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 <pktoss@gmail.com> */ -#include "config.h" +#include "nm-default.h" #include <sys/socket.h> #include <linux/atmdev.h> @@ -32,7 +32,6 @@ #include <stdlib.h> #include <string.h> -#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 */ |