Imported Upstream version 0.9.10.0 upstream/0.9.10.0

1 files changed, 0 insertions, 1675 deletions

diff --git a/src/nm-device-ethernet.c b/src/nm-device-ethernet.c
deleted file mode 100644
index 75824519..00000000
--- a/src/nm-device-ethernet.c
+++ /dev/null
@@ -1,1675 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/* NetworkManager -- Network link manager
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Copyright (C) 2005 - 2012 Red Hat, Inc.
- * Copyright (C) 2006 - 2008 Novell, Inc.
- */
-
-#include "config.h"
-#include <glib.h>
-#include <glib/gi18n.h>
-#include <netinet/in.h>
-#include <string.h>
-#include <stdlib.h>
-#include <linux/sockios.h>
-#include <linux/ethtool.h>
-#include <sys/ioctl.h>
-#include <unistd.h>
-#include <linux/if.h>
-#include <errno.h>
-#include <netinet/ether.h>
-
-#include <gudev/gudev.h>
-
-#include "nm-glib-compat.h"
-#include "nm-device-ethernet.h"
-#include "nm-device-private.h"
-#include "nm-activation-request.h"
-#include "NetworkManagerUtils.h"
-#include "nm-supplicant-manager.h"
-#include "nm-supplicant-interface.h"
-#include "nm-supplicant-config.h"
-#include "nm-system.h"
-#include "nm-setting-connection.h"
-#include "nm-setting-wired.h"
-#include "nm-setting-8021x.h"
-#include "nm-setting-pppoe.h"
-#include "nm-setting-bond.h"
-#include "ppp-manager/nm-ppp-manager.h"
-#include "nm-logging.h"
-#include "nm-properties-changed-signal.h"
-#include "nm-utils.h"
-#include "nm-enum-types.h"
-#include "nm-netlink-monitor.h"
-
-#include "nm-device-ethernet-glue.h"
-
-
-G_DEFINE_TYPE (NMDeviceEthernet, nm_device_ethernet, NM_TYPE_DEVICE_WIRED)
-
-#define NM_DEVICE_ETHERNET_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DEVICE_ETHERNET, NMDeviceEthernetPrivate))
-
-#define WIRED_SECRETS_TRIES "wired-secrets-tries"
-
-#define NM_ETHERNET_ERROR (nm_ethernet_error_quark ())
-
-typedef struct Supplicant {
-	NMSupplicantManager *mgr;
-	NMSupplicantInterface *iface;
-
-	/* signal handler ids */
-	guint iface_error_id;
-	guint iface_state_id;
-
-	/* Timeouts and idles */
-	guint iface_con_error_cb_id;
-	guint con_timeout_id;
-} Supplicant;
-
-typedef struct {
-	guint8              hw_addr[ETH_ALEN];         /* Current MAC address */
-	guint8              perm_hw_addr[ETH_ALEN];    /* Permanent MAC address */
-	guint8              initial_hw_addr[ETH_ALEN]; /* Initial MAC address (as seen when NM starts) */
-
-	Supplicant          supplicant;
-	guint               supplicant_timeout_id;
-
-	/* s390 */
-	char *              subchan1;
-	char *              subchan2;
-	char *              subchan3;
-	char *              subchannels; /* Composite used for checking unmanaged specs */
-
-	/* PPPoE */
-	NMPPPManager *ppp_manager;
-	NMIP4Config  *pending_ip4_config;
-} NMDeviceEthernetPrivate;
-
-enum {
-	PROPERTIES_CHANGED,
-
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-enum {
-	PROP_0,
-	PROP_HW_ADDRESS,
-	PROP_PERM_HW_ADDRESS,
-	PROP_SPEED,
-	PROP_CARRIER,
-
-	LAST_PROP
-};
-
-
-static gboolean supports_mii_carrier_detect (NMDeviceEthernet *dev);
-static gboolean supports_ethtool_carrier_detect (NMDeviceEthernet *dev);
-
-static GQuark
-nm_ethernet_error_quark (void)
-{
-	static GQuark quark = 0;
-	if (!quark)
-		quark = g_quark_from_static_string ("nm-ethernet-error");
-	return quark;
-}
-
-static void
-_update_s390_subchannels (NMDeviceEthernet *self)
-{
-	NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (self);
-	const char *iface;
-	GUdevClient *client;
-	GUdevDevice *dev;
-	GUdevDevice *parent = NULL;
-	const char *parent_path, *item, *driver;
-	const char *subsystems[] = { "net", NULL };
-	GDir *dir;
-	GError *error = NULL;
-
-	iface = nm_device_get_iface (NM_DEVICE (self));
-
-	client = g_udev_client_new (subsystems);
-	if (!client) {
-		nm_log_warn (LOGD_DEVICE | LOGD_HW, "(%s): failed to initialize GUdev client", iface);
-		return;
-	}
-
-	dev = g_udev_client_query_by_subsystem_and_name (client, "net", iface);
-	if (!dev) {
-		nm_log_warn (LOGD_DEVICE | LOGD_HW, "(%s): failed to find device with udev", iface);
-		goto out;
-	}
-
-	/* Try for the "ccwgroup" parent */
-	parent = g_udev_device_get_parent_with_subsystem (dev, "ccwgroup", NULL);
-	if (!parent) {
-		/* FIXME: whatever 'lcs' devices' subsystem is here... */
-		if (!parent) {
-			/* Not an s390 device */
-			goto out;
-		}
-	}
-
-	parent_path = g_udev_device_get_sysfs_path (parent);
-	dir = g_dir_open (parent_path, 0, &error);
-	if (!dir) {
-		nm_log_warn (LOGD_DEVICE | LOGD_HW, "(%s): failed to open directory '%s': %s",
-		             iface, parent_path,
-		             error && error->message ? error->message : "(unknown)");
-		g_clear_error (&error);
-		goto out;
-	}
-
-	/* FIXME: we probably care about ordering here to ensure that we map
-	 * cdev0 -> subchan1, cdev1 -> subchan2, etc.
-	 */
-	while ((item = g_dir_read_name (dir))) {
-		char buf[50];
-		char *cdev_path;
-
-		if (strncmp (item, "cdev", 4))
-			continue;  /* Not a subchannel link */
-
-		cdev_path = g_strdup_printf ("%s/%s", parent_path, item);
-
-		memset (buf, 0, sizeof (buf));
-		errno = 0;
-		if (readlink (cdev_path, &buf[0], sizeof (buf) - 1) >= 0) {
-			if (!priv->subchan1)
-				priv->subchan1 = g_path_get_basename (buf);
-			else if (!priv->subchan2)
-				priv->subchan2 = g_path_get_basename (buf);
-			else if (!priv->subchan3)
-				priv->subchan3 = g_path_get_basename (buf);
-		} else {
-			nm_log_warn (LOGD_DEVICE | LOGD_HW,
-			             "(%s): failed to read cdev link '%s': %d",
-			             iface, cdev_path, errno);
-		}
-		g_free (cdev_path);
-	};
-
-	g_dir_close (dir);
-
-	if (priv->subchan3) {
-		priv->subchannels = g_strdup_printf ("%s,%s,%s",
-		                                     priv->subchan1,
-		                                     priv->subchan2,
-		                                     priv->subchan3);
-	} else if (priv->subchan2) {
-		priv->subchannels = g_strdup_printf ("%s,%s",
-		                                     priv->subchan1,
-		                                     priv->subchan2);
-	} else
-		priv->subchannels = g_strdup (priv->subchan1);
-
-	driver = nm_device_get_driver (NM_DEVICE (self));
-	nm_log_info (LOGD_DEVICE | LOGD_HW,
-	             "(%s): found s390 '%s' subchannels [%s]",
-	             iface, driver ? driver : "(unknown driver)", priv->subchannels);
-
-out:
-	if (parent)
-		g_object_unref (parent);
-	if (dev)
-		g_object_unref (dev);
-	g_object_unref (client);
-}
-
-static GObject*
-constructor (GType type,
-			 guint n_construct_params,
-			 GObjectConstructParam *construct_params)
-{
-	GObject *object;
-	NMDeviceEthernetPrivate *priv;
-	NMDevice *self;
-	int itype;
-
-	object = G_OBJECT_CLASS (nm_device_ethernet_parent_class)->constructor (type,
-	                                                                        n_construct_params,
-	                                                                        construct_params);
-	if (object) {
-		self = NM_DEVICE (object);
-		priv = NM_DEVICE_ETHERNET_GET_PRIVATE (self);
-
-		// FIXME: Convert this into a no-export property so type can be specified
-		//        when the device is created.
-		itype = nm_system_get_iface_type (nm_device_get_ifindex (self), nm_device_get_iface (self));
-		g_assert (itype == NM_IFACE_TYPE_UNSPEC);
-
-		nm_log_dbg (LOGD_HW | LOGD_ETHER, "(%s): kernel ifindex %d",
-			        nm_device_get_iface (NM_DEVICE (self)),
-			        nm_device_get_ifindex (NM_DEVICE (self)));
-
-		/* s390 stuff */
-		_update_s390_subchannels (NM_DEVICE_ETHERNET (self));
-	}
-
-	return object;
-}
-
-static void
-clear_secrets_tries (NMDevice *device)
-{
-	NMActRequest *req;
-	NMConnection *connection;
-
-	req = nm_device_get_act_request (device);
-	if (req) {
-		connection = nm_act_request_get_connection (req);
-		/* Clear wired secrets tries on success, failure, or when deactivating */
-		g_object_set_data (G_OBJECT (connection), WIRED_SECRETS_TRIES, NULL);
-	}
-}
-
-static void
-device_state_changed (NMDevice *device,
-                      NMDeviceState new_state,
-                      NMDeviceState old_state,
-                      NMDeviceStateReason reason)
-{
-	switch (new_state) {
-	case NM_DEVICE_STATE_ACTIVATED:
-	case NM_DEVICE_STATE_FAILED:
-	case NM_DEVICE_STATE_DISCONNECTED:
-		clear_secrets_tries (device);
-		break;
-	default:
-		break;
-	}
-}
-
-static void
-nm_device_ethernet_init (NMDeviceEthernet * self)
-{
-}
-
-static gboolean
-is_up (NMDevice *device)
-{
-	if (!NM_DEVICE_ETHERNET_GET_PRIVATE (device)->supplicant.mgr)
-		return FALSE;
-
-	return TRUE;
-}
-
-static gboolean
-bring_up (NMDevice *dev)
-{
-	NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (dev);
-
-	priv->supplicant.mgr = nm_supplicant_manager_get ();
-
-	return priv->supplicant.mgr ? TRUE : FALSE;
-}
-
-static void
-take_down (NMDevice *dev)
-{
-	NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (dev);
-
-	if (priv->supplicant.mgr) {
-		g_object_unref (priv->supplicant.mgr);
-		priv->supplicant.mgr = NULL;
-	}
-}
-
-NMDevice *
-nm_device_ethernet_new (const char *udi,
-						const char *iface,
-						const char *driver)
-{
-	g_return_val_if_fail (udi != NULL, NULL);
-	g_return_val_if_fail (iface != NULL, NULL);
-	g_return_val_if_fail (driver != NULL, NULL);
-
-	return (NMDevice *) g_object_new (NM_TYPE_DEVICE_ETHERNET,
-	                                  NM_DEVICE_UDI, udi,
-	                                  NM_DEVICE_IFACE, iface,
-	                                  NM_DEVICE_DRIVER, driver,
-	                                  NM_DEVICE_TYPE_DESC, "Ethernet",
-	                                  NM_DEVICE_DEVICE_TYPE, NM_DEVICE_TYPE_ETHERNET,
-	                                  NULL);
-}
-
-static void
-update_hw_address (NMDevice *dev)
-{
-	NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (dev);
-	gsize addrlen;
-	gboolean changed = FALSE;
-
-	addrlen = nm_device_read_hwaddr (dev, priv->hw_addr, sizeof (priv->hw_addr), &changed);
-	if (addrlen) {
-		g_return_if_fail (addrlen == ETH_ALEN);
-		if (changed)
-			g_object_notify (G_OBJECT (dev), NM_DEVICE_ETHERNET_HW_ADDRESS);
-	}
-}
-
-static gboolean
-_set_hw_addr (NMDeviceEthernet *self, const guint8 *addr, const char *detail)
-{
-	NMDevice *dev = NM_DEVICE (self);
-	NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (self);
-	const char *iface;
-	char *mac_str = NULL;
-	gboolean success = FALSE;
-
-	g_return_val_if_fail (addr != NULL, FALSE);
-
-	iface = nm_device_get_iface (dev);
-
-	/* Do nothing if current MAC is same */
-	if (!memcmp (priv->hw_addr, addr, ETH_ALEN)) {
-		nm_log_dbg (LOGD_DEVICE | LOGD_ETHER, "(%s): no MAC address change needed", iface);
-		return TRUE;
-	}
-
-	mac_str = g_strdup_printf ("%02X:%02X:%02X:%02X:%02X:%02X",
-	                           addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
-
-	/* Can't change MAC address while device is up */
-	nm_device_hw_take_down (dev, FALSE);
-
-	success = nm_system_iface_set_mac (nm_device_get_ip_ifindex (dev), (struct ether_addr *) addr);
-	if (success) {
-		/* MAC address succesfully changed; update the current MAC to match */
-		update_hw_address (dev);
-		if (memcmp (priv->hw_addr, addr, ETH_ALEN) == 0) {
-			nm_log_info (LOGD_DEVICE | LOGD_ETHER, "(%s): %s MAC address to %s",
-			             iface, detail, mac_str);
-		} else {
-			nm_log_warn (LOGD_DEVICE | LOGD_ETHER, "(%s): new MAC address %s "
-			             "not successfully set",
-			             iface, mac_str);
-		}
-	} else {
-		nm_log_warn (LOGD_DEVICE | LOGD_ETHER, "(%s): failed to %s MAC address to %s",
-		             iface, detail, mac_str);
-	}
-	nm_device_hw_bring_up (dev, FALSE, NULL);
-	g_free (mac_str);
-
-	return success;
-}
-
-static void
-update_permanent_hw_address (NMDevice *dev)
-{
-	NMDeviceEthernet *self = NM_DEVICE_ETHERNET (dev);
-	NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (self);
-	struct ifreq req;
-	struct ethtool_perm_addr *epaddr = NULL;
-	int fd, ret;
-
-	fd = socket (PF_INET, SOCK_DGRAM, 0);
-	if (fd < 0) {
-		nm_log_warn (LOGD_HW, "couldn't open control socket.");
-		return;
-	}
-
-	/* Get permanent MAC address */
-	memset (&req, 0, sizeof (struct ifreq));
-	strncpy (req.ifr_name, nm_device_get_iface (dev), IFNAMSIZ);
-
-	epaddr = g_malloc0 (sizeof (struct ethtool_perm_addr) + ETH_ALEN);
-	epaddr->cmd = ETHTOOL_GPERMADDR;
-	epaddr->size = ETH_ALEN;
-	req.ifr_data = (void *) epaddr;
-
-	errno = 0;
-	ret = ioctl (fd, SIOCETHTOOL, &req);
-	if ((ret < 0) || !nm_ethernet_address_is_valid ((struct ether_addr *) epaddr->data)) {
-		nm_log_dbg (LOGD_HW | LOGD_ETHER, "(%s): unable to read permanent MAC address (error %d)",
-		            nm_device_get_iface (dev), errno);
-		/* Fall back to current address */
-		memcpy (epaddr->data, priv->hw_addr, ETH_ALEN);
-	}
-
-	if (memcmp (&priv->perm_hw_addr, epaddr->data, ETH_ALEN)) {
-		memcpy (&priv->perm_hw_addr, epaddr->data, ETH_ALEN);
-		g_object_notify (G_OBJECT (dev), NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS);
-	}
-
-	g_free (epaddr);
-	close (fd);
-}
-
-static void
-update_initial_hw_address (NMDevice *dev)
-{
-	NMDeviceEthernet *self = NM_DEVICE_ETHERNET (dev);
-	NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (self);
-	gsize addrlen;
-	char *mac_str = NULL;
-
-	/* This sets initial MAC address from current MAC address. It should only
-	 * be called from NMDevice constructor() to really get the initial address.
-	 */
-	addrlen = nm_device_read_hwaddr (dev,
-	                                 priv->initial_hw_addr,
-	                                 sizeof (priv->initial_hw_addr),
-	                                 NULL);
-	if (addrlen)
-		g_return_if_fail (addrlen == ETH_ALEN);
-
-	mac_str = g_strdup_printf ("%02X:%02X:%02X:%02X:%02X:%02X",
-	                           priv->initial_hw_addr[0],
-	                           priv->initial_hw_addr[1],
-	                           priv->initial_hw_addr[2],
-	                           priv->initial_hw_addr[3],
-	                           priv->initial_hw_addr[4],
-	                           priv->initial_hw_addr[5]);
-
-	nm_log_dbg (LOGD_DEVICE | LOGD_ETHER, "(%s): read initial MAC address %s",
-	            nm_device_get_iface (dev), mac_str);
-
-	g_free (mac_str);
-}
-
-static const guint8 *
-get_hw_address (NMDevice *device, guint *out_len)
-{
-	*out_len = ETH_ALEN;
-	return NM_DEVICE_ETHERNET_GET_PRIVATE (device)->hw_addr;
-}
-
-static guint32
-get_generic_capabilities (NMDevice *dev)
-{
-	NMDeviceEthernet *self = NM_DEVICE_ETHERNET (dev);
-	guint32	caps = NM_DEVICE_CAP_NONE;
-
-	/* cipsec devices are also explicitly unsupported at this time */
-	if (strstr (nm_device_get_iface (dev), "cipsec"))
-		return NM_DEVICE_CAP_NONE;
-
-	if (supports_ethtool_carrier_detect (self) || supports_mii_carrier_detect (self))
-		caps |= NM_DEVICE_CAP_CARRIER_DETECT;
-
-	caps |= NM_DEVICE_CAP_NM_SUPPORTED;
-
-	return caps;
-}
-
-static gboolean
-match_subchans (NMDeviceEthernet *self, NMSettingWired *s_wired, gboolean *try_mac)
-{
-	NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (self);
-	const GPtrArray *subchans;
-	int i;
-
-	*try_mac = TRUE;
-
-	subchans = nm_setting_wired_get_s390_subchannels (s_wired);
-	if (!subchans)
-		return TRUE;
-
-	/* connection requires subchannels but the device has none */
-	if (!priv->subchannels)
-		return FALSE;
-
-	/* Make sure each subchannel in the connection is a subchannel of this device */
-	for (i = 0; i < subchans->len; i++) {
-		const char *candidate = g_ptr_array_index (subchans, i);
-
-		if (   (priv->subchan1 && !strcmp (priv->subchan1, candidate))
-		    || (priv->subchan2 && !strcmp (priv->subchan2, candidate))
-		    || (priv->subchan3 && !strcmp (priv->subchan3, candidate)))
-			continue;
-
-		return FALSE;  /* a subchannel was not found */
-	}
-
-	*try_mac = FALSE;
-	return TRUE;
-}
-
-static gboolean
-match_ethernet_connection (NMDevice *device, NMConnection *connection,
-                           gboolean check_blacklist, GError **error)
-{
-	NMDeviceEthernet *self = NM_DEVICE_ETHERNET (device);
-	NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (self);
-	NMSettingWired *s_wired;
-
-	s_wired = nm_connection_get_setting_wired (connection);
-
-	if (nm_connection_is_type (connection, NM_SETTING_PPPOE_SETTING_NAME)) {
-		/* NOP */
-	} else if (nm_connection_is_type (connection, NM_SETTING_WIRED_SETTING_NAME)) {
-		if (!s_wired) {
-			g_set_error (error,
-			             NM_ETHERNET_ERROR, NM_ETHERNET_ERROR_CONNECTION_INVALID,
-			             "The connection was not a valid wired connection.");
-			return FALSE;
-		}
-	} else {
-		g_set_error (error,
-		             NM_ETHERNET_ERROR, NM_ETHERNET_ERROR_CONNECTION_NOT_WIRED,
-		             "The connection was not a wired, bond, or PPPoE connection.");
-		return FALSE;
-	}
-
-	if (s_wired) {
-		const GByteArray *mac;
-		gboolean try_mac = TRUE;
-		const GSList *mac_blacklist, *mac_blacklist_iter;
-
-		if (!match_subchans (self, s_wired, &try_mac)) {
-			g_set_error (error,
-			             NM_ETHERNET_ERROR, NM_ETHERNET_ERROR_CONNECTION_INCOMPATIBLE,
-			             "The connection's s390 subchannels did not match this device.");
-			return FALSE;
-		}
-
-		mac = nm_setting_wired_get_mac_address (s_wired);
-		if (try_mac && mac && memcmp (mac->data, &priv->perm_hw_addr, ETH_ALEN)) {
-			g_set_error (error,
-			             NM_ETHERNET_ERROR, NM_ETHERNET_ERROR_CONNECTION_INCOMPATIBLE,
-			             "The connection's MAC address did not match this device.");
-			return FALSE;
-		}
-
-		if (!check_blacklist)
-			return TRUE;
-
-		/* Check for MAC address blacklist */
-		mac_blacklist = nm_setting_wired_get_mac_address_blacklist (s_wired);
-		for (mac_blacklist_iter = mac_blacklist; mac_blacklist_iter;
-			 mac_blacklist_iter = g_slist_next (mac_blacklist_iter)) {
-			struct ether_addr addr;
-
-			if (!ether_aton_r (mac_blacklist_iter->data, &addr)) {
-				g_warn_if_reached ();
-				return FALSE;
-			}
-			if (memcmp (&addr, &priv->perm_hw_addr, ETH_ALEN) == 0) {
-				g_set_error (error,
-				             NM_ETHERNET_ERROR, NM_ETHERNET_ERROR_CONNECTION_INCOMPATIBLE,
-				             "The connection's MAC address (%s) is blacklisted in %s.",
-				             (char *) mac_blacklist_iter->data, NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST);
-				return FALSE;
-			}
-		}
-	}
-
-	return TRUE;
-}
-
-static NMConnection *
-get_best_auto_connection (NMDevice *dev,
-                          GSList *connections,
-                          char **specific_object)
-{
-	GSList *iter;
-
-	for (iter = connections; iter; iter = g_slist_next (iter)) {
-		NMConnection *connection = NM_CONNECTION (iter->data);
-
-		if (match_ethernet_connection (dev, connection, TRUE, NULL))
-			return connection;
-	}
-
-	return NULL;
-}
-
-/* FIXME: Move it to nm-device.c and then get rid of all foo_device_get_setting() all around.
-   It's here now to keep the patch short. */
-static NMSetting *
-device_get_setting (NMDevice *device, GType setting_type)
-{
-	NMActRequest *req;
-	NMSetting *setting = NULL;
-
-	req = nm_device_get_act_request (device);
-	if (req) {
-		NMConnection *connection;
-
-		connection = nm_act_request_get_connection (req);
-		if (connection)
-			setting = nm_connection_get_setting (connection, setting_type);
-	}
-
-	return setting;
-}
-
-/*****************************************************************************/
-/* 802.1X */
-
-static void
-remove_supplicant_timeouts (NMDeviceEthernet *self)
-{
-	NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (self);
-
-	if (priv->supplicant.con_timeout_id) {
-		g_source_remove (priv->supplicant.con_timeout_id);
-		priv->supplicant.con_timeout_id = 0;
-	}
-
-	if (priv->supplicant_timeout_id) {
-		g_source_remove (priv->supplicant_timeout_id);
-		priv->supplicant_timeout_id = 0;
-	}
-}
-
-static void
-remove_supplicant_interface_error_handler (NMDeviceEthernet *self)
-{
-	NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (self);
-
-	if (priv->supplicant.iface_error_id != 0) {
-		g_signal_handler_disconnect (priv->supplicant.iface, priv->supplicant.iface_error_id);
-		priv->supplicant.iface_error_id = 0;
-	}
-
-	if (priv->supplicant.iface_con_error_cb_id > 0) {
-		g_source_remove (priv->supplicant.iface_con_error_cb_id);
-		priv->supplicant.iface_con_error_cb_id = 0;
-	}
-}
-
-static void
-supplicant_interface_release (NMDeviceEthernet *self)
-{
-	NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (self);
-
-	remove_supplicant_timeouts (self);
-	remove_supplicant_interface_error_handler (self);
-
-	if (priv->supplicant.iface_state_id > 0) {
-		g_signal_handler_disconnect (priv->supplicant.iface, priv->supplicant.iface_state_id);
-		priv->supplicant.iface_state_id = 0;
-	}
-
-	if (priv->supplicant.iface) {
-		nm_supplicant_interface_disconnect (priv->supplicant.iface);
-		nm_supplicant_manager_iface_release (priv->supplicant.mgr, priv->supplicant.iface);
-		priv->supplicant.iface = NULL;
-	}
-}
-
-static void
-wired_secrets_cb (NMActRequest *req,
-                  guint32 call_id,
-                  NMConnection *connection,
-                  GError *error,
-                  gpointer user_data)
-{
-	NMDevice *dev = NM_DEVICE (user_data);
-
-	g_return_if_fail (req == nm_device_get_act_request (dev));
-	g_return_if_fail (nm_device_get_state (dev) == NM_DEVICE_STATE_NEED_AUTH);
-	g_return_if_fail (nm_act_request_get_connection (req) == connection);
-
-	if (error) {
-		nm_log_warn (LOGD_ETHER, "%s", error->message);
-		nm_device_state_changed (dev,
-		                         NM_DEVICE_STATE_FAILED,
-		                         NM_DEVICE_STATE_REASON_NO_SECRETS);
-	} else
-		nm_device_activate_schedule_stage1_device_prepare (dev);
-}
-
-static gboolean
-link_timeout_cb (gpointer user_data)
-{
-	NMDeviceEthernet *self = NM_DEVICE_ETHERNET (user_data);
-	NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (self);
-	NMDevice *dev = NM_DEVICE (self);
-	NMActRequest *req;
-	NMConnection *connection;
-	const char *setting_name;
-
-	priv->supplicant_timeout_id = 0;
-
-	req = nm_device_get_act_request (dev);
-
-	if (nm_device_get_state (dev) == NM_DEVICE_STATE_ACTIVATED) {
-		nm_device_state_changed (dev,
-		                         NM_DEVICE_STATE_FAILED,
-		                         NM_DEVICE_STATE_REASON_SUPPLICANT_TIMEOUT);
-		return FALSE;
-	}
-
-	/* Disconnect event during initial authentication and credentials
-	 * ARE checked - we are likely to have wrong key.  Ask the user for
-	 * another one.
-	 */
-	if (nm_device_get_state (dev) != NM_DEVICE_STATE_CONFIG)
-		goto time_out;
-
-	connection = nm_act_request_get_connection (req);
-	nm_connection_clear_secrets (connection);
-	setting_name = nm_connection_need_secrets (connection, NULL);
-	if (!setting_name)
-		goto time_out;
-
-	nm_log_info (LOGD_DEVICE | LOGD_ETHER,
-	             "Activation (%s/wired): disconnected during authentication,"
-	             " asking for new key.",
-	             nm_device_get_iface (dev));
-	supplicant_interface_release (self);
-
-	nm_device_state_changed (dev, NM_DEVICE_STATE_NEED_AUTH, NM_DEVICE_STATE_REASON_SUPPLICANT_DISCONNECT);
-	nm_act_request_get_secrets (req,
-	                            setting_name,
-	                            NM_SETTINGS_GET_SECRETS_FLAG_REQUEST_NEW,
-	                            NULL,
-	                            wired_secrets_cb,
-	                            self);
-
-	return FALSE;
-
-time_out:
-	nm_log_warn (LOGD_DEVICE | LOGD_ETHER,
-	             "(%s): link timed out.", nm_device_get_iface (dev));
-	nm_device_state_changed (dev, NM_DEVICE_STATE_FAILED, NM_DEVICE_STATE_REASON_SUPPLICANT_DISCONNECT);
-
-	return FALSE;
-}
-
-static NMSupplicantConfig *
-build_supplicant_config (NMDeviceEthernet *self)
-{
-	const char *con_uuid;
-	NMSupplicantConfig *config = NULL;
-	NMSetting8021x *security;
-	NMConnection *connection;
-
-	connection = nm_device_get_connection (NM_DEVICE (self));
-	g_assert (connection);
-	con_uuid = nm_connection_get_uuid (connection);
-
-	config = nm_supplicant_config_new ();
-	if (!config)
-		return NULL;
-
-	security = nm_connection_get_setting_802_1x (connection);
-	if (!nm_supplicant_config_add_setting_8021x (config, security, con_uuid, TRUE)) {
-		nm_log_warn (LOGD_DEVICE, "Couldn't add 802.1X security setting to supplicant config.");
-		g_object_unref (config);
-		config = NULL;
-	}
-
-	return config;
-}
-
-static void
-supplicant_iface_state_cb (NMSupplicantInterface *iface,
-                           guint32 new_state,
-                           guint32 old_state,
-                           int disconnect_reason,
-                           gpointer user_data)
-{
-	NMDeviceEthernet *self = NM_DEVICE_ETHERNET (user_data);
-	NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (self);
-	NMDevice *device = NM_DEVICE (self);
-	NMSupplicantConfig *config;
-	gboolean success = FALSE;
-	NMDeviceState devstate;
-
-	if (new_state == old_state)
-		return;
-
-	nm_log_info (LOGD_DEVICE | LOGD_ETHER,
-	             "(%s): supplicant interface state: %s -> %s",
-	             nm_device_get_iface (device),
-	             nm_supplicant_interface_state_to_string (old_state),
-	             nm_supplicant_interface_state_to_string (new_state));
-
-	devstate = nm_device_get_state (device);
-
-	switch (new_state) {
-	case NM_SUPPLICANT_INTERFACE_STATE_READY:
-		config = build_supplicant_config (self);
-		if (config) {
-			success = nm_supplicant_interface_set_config (priv->supplicant.iface, config);
-			g_object_unref (config);
-
-			if (!success) {
-				nm_log_err (LOGD_DEVICE | LOGD_ETHER,
-				            "Activation (%s/wired): couldn't send security "
-						    "configuration to the supplicant.",
-						    nm_device_get_iface (device));
-			}
-		} else {
-			nm_log_warn (LOGD_DEVICE | LOGD_ETHER,
-			             "Activation (%s/wired): couldn't build security configuration.",
-			             nm_device_get_iface (device));
-		}
-
-		if (!success) {
-			nm_device_state_changed (device,
-			                         NM_DEVICE_STATE_FAILED,
-			                         NM_DEVICE_STATE_REASON_SUPPLICANT_CONFIG_FAILED);
-		}
-		break;
-	case NM_SUPPLICANT_INTERFACE_STATE_COMPLETED:
-		remove_supplicant_interface_error_handler (self);
-		remove_supplicant_timeouts (self);
-
-		/* If this is the initial association during device activation,
-		 * schedule the next activation stage.
-		 */
-		if (devstate == NM_DEVICE_STATE_CONFIG) {
-			nm_log_info (LOGD_DEVICE | LOGD_ETHER,
-			             "Activation (%s/wired) Stage 2 of 5 (Device Configure) successful.",
-				         nm_device_get_iface (device));
-			nm_device_activate_schedule_stage3_ip_config_start (device);
-		}
-		break;
-	case NM_SUPPLICANT_INTERFACE_STATE_DISCONNECTED:
-		if ((devstate == NM_DEVICE_STATE_ACTIVATED) || nm_device_is_activating (device)) {
-			/* Start the link timeout so we allow some time for reauthentication */
-			if (!priv->supplicant_timeout_id)
-				priv->supplicant_timeout_id = g_timeout_add_seconds (15, link_timeout_cb, device);
-		}
-		break;
-	case NM_SUPPLICANT_INTERFACE_STATE_DOWN:
-		supplicant_interface_release (self);
-		remove_supplicant_timeouts (self);
-
-		if ((devstate == NM_DEVICE_STATE_ACTIVATED) || nm_device_is_activating (device)) {
-			nm_device_state_changed (device,
-			                         NM_DEVICE_STATE_FAILED,
-			                         NM_DEVICE_STATE_REASON_SUPPLICANT_FAILED);
-		}
-		break;
-	default:
-		break;
-	}
-}
-
-static gboolean
-supplicant_iface_connection_error_cb_handler (gpointer user_data)
-{
-	NMDeviceEthernet *self = NM_DEVICE_ETHERNET (user_data);
-	NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (self);
-
-	supplicant_interface_release (self);
-	nm_device_state_changed (NM_DEVICE (self), NM_DEVICE_STATE_FAILED, NM_DEVICE_STATE_REASON_SUPPLICANT_CONFIG_FAILED);
-
-	priv->supplicant.iface_con_error_cb_id = 0;
-	return FALSE;
-}
-
-static void
-supplicant_iface_connection_error_cb (NMSupplicantInterface *iface,
-                                      const char *name,
-                                      const char *message,
-                                      gpointer user_data)
-{
-	NMDeviceEthernet *self = NM_DEVICE_ETHERNET (user_data);
-	NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (self);
-	guint id;
-
-	nm_log_warn (LOGD_DEVICE | LOGD_ETHER,
-	             "Activation (%s/wired): association request to the supplicant failed: %s - %s",
-	             nm_device_get_iface (NM_DEVICE (self)), name, message);
-
-	if (priv->supplicant.iface_con_error_cb_id)
-		g_source_remove (priv->supplicant.iface_con_error_cb_id);
-
-	id = g_idle_add (supplicant_iface_connection_error_cb_handler, self);
-	priv->supplicant.iface_con_error_cb_id = id;
-}
-
-static NMActStageReturn
-handle_auth_or_fail (NMDeviceEthernet *self,
-                     NMActRequest *req,
-                     gboolean new_secrets)
-{
-	const char *setting_name;
-	guint32 tries;
-	NMConnection *connection;
-
-	connection = nm_act_request_get_connection (req);
-	g_assert (connection);
-
-	tries = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (connection), WIRED_SECRETS_TRIES));
-	if (tries > 3)
-		return NM_ACT_STAGE_RETURN_FAILURE;
-
-	nm_device_state_changed (NM_DEVICE (self), NM_DEVICE_STATE_NEED_AUTH, NM_DEVICE_STATE_REASON_NONE);
-
-	nm_connection_clear_secrets (connection);
-	setting_name = nm_connection_need_secrets (connection, NULL);
-	if (setting_name) {
-		NMSettingsGetSecretsFlags flags = NM_SETTINGS_GET_SECRETS_FLAG_ALLOW_INTERACTION;
-
-		/* If the caller doesn't necessarily want completely new secrets,
-		 * only ask for new secrets after the first failure.
-		 */
-		if (new_secrets || tries)
-			flags |= NM_SETTINGS_GET_SECRETS_FLAG_REQUEST_NEW;
-		nm_act_request_get_secrets (req, setting_name, flags, NULL, wired_secrets_cb, self);
-
-		g_object_set_data (G_OBJECT (connection), WIRED_SECRETS_TRIES, GUINT_TO_POINTER (++tries));
-	} else {
-		nm_log_info (LOGD_DEVICE, "Cleared secrets, but setting didn't need any secrets.");
-	}
-
-	return NM_ACT_STAGE_RETURN_POSTPONE;
-}
-
-static gboolean
-supplicant_connection_timeout_cb (gpointer user_data)
-{
-	NMDeviceEthernet *self = NM_DEVICE_ETHERNET (user_data);
-	NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (self);
-	NMDevice *device = NM_DEVICE (self);
-	NMActRequest *req;
-	const char *iface;
-
-	priv->supplicant.con_timeout_id = 0;
-
-	iface = nm_device_get_iface (device);
-
-	/* Authentication failed, encryption key is probably bad */
-	nm_log_warn (LOGD_DEVICE | LOGD_ETHER,
-	             "Activation (%s/wired): association took too long.", iface);
-
-	supplicant_interface_release (self);
-	req = nm_device_get_act_request (device);
-	g_assert (req);
-
-	if (handle_auth_or_fail (self, req, TRUE) == NM_ACT_STAGE_RETURN_POSTPONE) {
-		nm_log_info (LOGD_DEVICE | LOGD_ETHER,
-		             "Activation (%s/wired): asking for new secrets", iface);
-	} else
-		nm_device_state_changed (device, NM_DEVICE_STATE_FAILED, NM_DEVICE_STATE_REASON_NO_SECRETS);
-
-	return FALSE;
-}
-
-static gboolean
-supplicant_interface_init (NMDeviceEthernet *self)
-{
-	NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (self);
-	const char *iface;
-
-	iface = nm_device_get_iface (NM_DEVICE (self));
-
-	/* Create supplicant interface */
-	priv->supplicant.iface = nm_supplicant_manager_iface_get (priv->supplicant.mgr, iface, FALSE);
-	if (!priv->supplicant.iface) {
-		nm_log_err (LOGD_DEVICE | LOGD_ETHER,
-		            "Couldn't initialize supplicant interface for %s.",
-		            iface);
-		supplicant_interface_release (self);
-		return FALSE;
-	}
-
-	/* Listen for it's state signals */
-	priv->supplicant.iface_state_id = g_signal_connect (priv->supplicant.iface,
-	                                                    NM_SUPPLICANT_INTERFACE_STATE,
-	                                                    G_CALLBACK (supplicant_iface_state_cb),
-	                                                    self);
-
-	/* Hook up error signal handler to capture association errors */
-	priv->supplicant.iface_error_id = g_signal_connect (priv->supplicant.iface,
-	                                                    "connection-error",
-	                                                    G_CALLBACK (supplicant_iface_connection_error_cb),
-	                                                    self);
-
-	/* Set up a timeout on the connection attempt to fail it after 25 seconds */
-	priv->supplicant.con_timeout_id = g_timeout_add_seconds (25, supplicant_connection_timeout_cb, self);
-
-	return TRUE;
-}
-
-static NMActStageReturn
-act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason)
-{
-	NMDeviceEthernet *self = NM_DEVICE_ETHERNET (dev);
-	NMActRequest *req;
-	NMSettingWired *s_wired;
-	const GByteArray *cloned_mac;
-	NMActStageReturn ret = NM_ACT_STAGE_RETURN_SUCCESS;
-
-	g_return_val_if_fail (reason != NULL, NM_ACT_STAGE_RETURN_FAILURE);
-
-	ret = NM_DEVICE_CLASS (nm_device_ethernet_parent_class)->act_stage1_prepare (dev, reason);
-	if (ret == NM_ACT_STAGE_RETURN_SUCCESS) {
-		req = nm_device_get_act_request (NM_DEVICE (self));
-		g_return_val_if_fail (req != NULL, NM_ACT_STAGE_RETURN_FAILURE);
-
-		s_wired = (NMSettingWired *) device_get_setting (dev, NM_TYPE_SETTING_WIRED);
-		if (s_wired) {
-			/* Set device MAC address if the connection wants to change it */
-			cloned_mac = nm_setting_wired_get_cloned_mac_address (s_wired);
-			if (cloned_mac && (cloned_mac->len == ETH_ALEN))
-				_set_hw_addr (self, (const guint8 *) cloned_mac->data, "set");
-		}
-	}
-
-	return ret;
-}
-
-static NMActStageReturn
-nm_8021x_stage2_config (NMDeviceEthernet *self, NMDeviceStateReason *reason)
-{
-	NMConnection *connection;
-	NMSetting8021x *security;
-	const char *setting_name;
-	const char *iface;
-	NMActStageReturn ret = NM_ACT_STAGE_RETURN_FAILURE;
-
-	connection = nm_device_get_connection (NM_DEVICE (self));
-	g_assert (connection);
-	security = nm_connection_get_setting_802_1x (connection);
-	if (!security) {
-		nm_log_err (LOGD_DEVICE, "Invalid or missing 802.1X security");
-		*reason = NM_DEVICE_STATE_REASON_CONFIG_FAILED;
-		return ret;
-	}
-
-	iface = nm_device_get_iface (NM_DEVICE (self));
-
-	/* If we need secrets, get them */
-	setting_name = nm_connection_need_secrets (connection, NULL);
-	if (setting_name) {
-		NMActRequest *req = nm_device_get_act_request (NM_DEVICE (self));
-
-		nm_log_info (LOGD_DEVICE | LOGD_ETHER,
-		             "Activation (%s/wired): connection '%s' has security, but secrets are required.",
-				     iface, nm_connection_get_id (connection));
-
-		ret = handle_auth_or_fail (self, req, FALSE);
-		if (ret != NM_ACT_STAGE_RETURN_POSTPONE)
-			*reason = NM_DEVICE_STATE_REASON_NO_SECRETS;
-	} else {
-		nm_log_info (LOGD_DEVICE | LOGD_ETHER,
-		             "Activation (%s/wired): connection '%s' requires no security. No secrets needed.",
-				     iface, nm_connection_get_id (connection));
-
-		if (supplicant_interface_init (self))
-			ret = NM_ACT_STAGE_RETURN_POSTPONE;
-		else
-			*reason = NM_DEVICE_STATE_REASON_CONFIG_FAILED;
-	}
-
-	return ret;
-}
-
-/*****************************************************************************/
-/* PPPoE */
-
-static void
-ppp_state_changed (NMPPPManager *ppp_manager, NMPPPStatus status, gpointer user_data)
-{
-	NMDevice *device = NM_DEVICE (user_data);
-
-	switch (status) {
-	case NM_PPP_STATUS_DISCONNECT:
-		nm_device_state_changed (device, NM_DEVICE_STATE_FAILED, NM_DEVICE_STATE_REASON_PPP_DISCONNECT);
-		break;
-	case NM_PPP_STATUS_DEAD:
-		nm_device_state_changed (device, NM_DEVICE_STATE_FAILED, NM_DEVICE_STATE_REASON_PPP_FAILED);
-		break;
-	default:
-		break;
-	}
-}
-
-static void
-ppp_ip4_config (NMPPPManager *ppp_manager,
-                const char *iface,
-                NMIP4Config *config,
-                gpointer user_data)
-{
-	NMDevice *device = NM_DEVICE (user_data);
-
-	/* Ignore PPP IP4 events that come in after initial configuration */
-	if (nm_device_activate_ip4_state_in_conf (device)) {
-		nm_device_set_ip_iface (device, iface);
-		nm_device_activate_schedule_ip4_config_result (device, config);
-	}
-}
-
-static NMActStageReturn
-pppoe_stage3_ip4_config_start (NMDeviceEthernet *self, NMDeviceStateReason *reason)
-{
-	NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (self);
-	NMConnection *connection;
-	NMSettingPPPOE *s_pppoe;
-	NMActRequest *req;
-	GError *err = NULL;
-	NMActStageReturn ret = NM_ACT_STAGE_RETURN_FAILURE;
-
-	req = nm_device_get_act_request (NM_DEVICE (self));
-	g_assert (req);
-
-	connection = nm_act_request_get_connection (req);
-	g_assert (req);
-
-	s_pppoe = nm_connection_get_setting_pppoe (connection);
-	g_assert (s_pppoe);
-
-	priv->ppp_manager = nm_ppp_manager_new (nm_device_get_iface (NM_DEVICE (self)));
-	if (nm_ppp_manager_start (priv->ppp_manager, req, nm_setting_pppoe_get_username (s_pppoe), 30, &err)) {
-		g_signal_connect (priv->ppp_manager, "state-changed",
-					   G_CALLBACK (ppp_state_changed),
-					   self);
-		g_signal_connect (priv->ppp_manager, "ip4-config",
-					   G_CALLBACK (ppp_ip4_config),
-					   self);
-		ret = NM_ACT_STAGE_RETURN_POSTPONE;
-	} else {
-		nm_log_warn (LOGD_DEVICE, "(%s): PPPoE failed to start: %s",
-		             nm_device_get_iface (NM_DEVICE (self)), err->message);
-		g_error_free (err);
-
-		g_object_unref (priv->ppp_manager);
-		priv->ppp_manager = NULL;
-
-		*reason = NM_DEVICE_STATE_REASON_PPP_START_FAILED;
-	}
-
-	return ret;
-}
-
-static NMActStageReturn
-act_stage2_config (NMDevice *device, NMDeviceStateReason *reason)
-{
-	NMSettingConnection *s_con;
-	const char *connection_type;
-	NMActStageReturn ret = NM_ACT_STAGE_RETURN_SUCCESS;
-
-	g_return_val_if_fail (reason != NULL, NM_ACT_STAGE_RETURN_FAILURE);
-
-	s_con = NM_SETTING_CONNECTION (device_get_setting (device, NM_TYPE_SETTING_CONNECTION));
-	g_assert (s_con);
-
-	/* 802.1x has to run before any IP configuration since the 802.1x auth
-	 * process opens the port up for normal traffic.
-	 */
-	connection_type = nm_setting_connection_get_connection_type (s_con);
-	if (!strcmp (connection_type, NM_SETTING_WIRED_SETTING_NAME)) {
-		NMSetting8021x *security;
-
-		security = (NMSetting8021x *) device_get_setting (device, NM_TYPE_SETTING_802_1X);
-		if (security)
-			ret = nm_8021x_stage2_config (NM_DEVICE_ETHERNET (device), reason);
-	}
-
-	return ret;
-}
-
-static NMActStageReturn
-act_stage3_ip4_config_start (NMDevice *device,
-                             NMIP4Config **out_config,
-                             NMDeviceStateReason *reason)
-{
-	NMSettingConnection *s_con;
-	const char *connection_type;
-
-	g_return_val_if_fail (reason != NULL, NM_ACT_STAGE_RETURN_FAILURE);
-
-	s_con = NM_SETTING_CONNECTION (device_get_setting (device, NM_TYPE_SETTING_CONNECTION));
-	g_assert (s_con);
-
-	connection_type = nm_setting_connection_get_connection_type (s_con);
-	if (!strcmp (connection_type, NM_SETTING_PPPOE_SETTING_NAME))
-		return pppoe_stage3_ip4_config_start (NM_DEVICE_ETHERNET (device), reason);
-
-	return NM_DEVICE_CLASS (nm_device_ethernet_parent_class)->act_stage3_ip4_config_start (device, out_config, reason);
-}
-
-static void
-ip4_config_pre_commit (NMDevice *device, NMIP4Config *config)
-{
-	NMConnection *connection;
-	NMSettingWired *s_wired;
-	guint32 mtu;
-
-	/* MTU only set for plain ethernet */
-	if (NM_DEVICE_ETHERNET_GET_PRIVATE (device)->ppp_manager)
-		return;
-
-	connection = nm_device_get_connection (device);
-	g_assert (connection);
-	s_wired = nm_connection_get_setting_wired (connection);
-	g_assert (s_wired);
-
-	/* MTU override */
-	mtu = nm_setting_wired_get_mtu (s_wired);
-	if (mtu)
-		nm_ip4_config_set_mtu (config, mtu);
-}
-
-static void
-deactivate (NMDevice *device)
-{
-	NMDeviceEthernet *self = NM_DEVICE_ETHERNET (device);
-	NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (self);
-
-	/* Clear wired secrets tries when deactivating */
-	clear_secrets_tries (device);
-
-	if (priv->pending_ip4_config) {
-		g_object_unref (priv->pending_ip4_config);
-		priv->pending_ip4_config = NULL;
-	}
-
-	if (priv->ppp_manager) {
-		g_object_unref (priv->ppp_manager);
-		priv->ppp_manager = NULL;
-	}
-
-	supplicant_interface_release (self);
-
-	/* Reset MAC address back to initial address */
-	_set_hw_addr (self, priv->initial_hw_addr, "reset");
-}
-
-static gboolean
-check_connection_compatible (NMDevice *device,
-                             NMConnection *connection,
-                             GError **error)
-{
-	return match_ethernet_connection (device, connection, TRUE, error);
-}
-
-static gboolean
-complete_connection (NMDevice *device,
-                     NMConnection *connection,
-                     const char *specific_object,
-                     const GSList *existing_connections,
-                     GError **error)
-{
-	NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (device);
-	NMSettingWired *s_wired;
-	NMSettingPPPOE *s_pppoe;
-	const GByteArray *setting_mac;
-
-	s_pppoe = nm_connection_get_setting_pppoe (connection);
-
-	/* We can't telepathically figure out the service name or username, so if
-	 * those weren't given, we can't complete the connection.
-	 */
-	if (s_pppoe && !nm_setting_verify (NM_SETTING (s_pppoe), NULL, error))
-		return FALSE;
-
-	/* Default to an ethernet-only connection, but if a PPPoE setting was given
-	 * then PPPoE should be our connection type.
-	 */
-	nm_utils_complete_generic (connection,
-	                           s_pppoe ? NM_SETTING_PPPOE_SETTING_NAME : NM_SETTING_WIRED_SETTING_NAME,
-	                           existing_connections,
-	                           s_pppoe ? _("PPPoE connection %d") : _("Wired connection %d"),
-	                           NULL,
-	                           s_pppoe ? FALSE : TRUE); /* No IPv6 by default yet for PPPoE */
-
-	s_wired = nm_connection_get_setting_wired (connection);
-	if (!s_wired) {
-		s_wired = (NMSettingWired *) nm_setting_wired_new ();
-		nm_connection_add_setting (connection, NM_SETTING (s_wired));
-	}
-
-	setting_mac = nm_setting_wired_get_mac_address (s_wired);
-	if (setting_mac) {
-		/* Make sure the setting MAC (if any) matches the device's permanent MAC */
-		if (memcmp (setting_mac->data, priv->perm_hw_addr, ETH_ALEN)) {
-			g_set_error_literal (error,
-			                     NM_SETTING_WIRED_ERROR,
-			                     NM_SETTING_WIRED_ERROR_INVALID_PROPERTY,
-			                     NM_SETTING_WIRED_MAC_ADDRESS);
-			return FALSE;
-		}
-	} else {
-		GByteArray *mac;
-		const guint8 null_mac[ETH_ALEN] = { 0, 0, 0, 0, 0, 0 };
-
-		/* Lock the connection to this device by default */
-		if (memcmp (priv->perm_hw_addr, null_mac, ETH_ALEN)) {
-			mac = g_byte_array_sized_new (ETH_ALEN);
-			g_byte_array_append (mac, priv->perm_hw_addr, ETH_ALEN);
-			g_object_set (G_OBJECT (s_wired), NM_SETTING_WIRED_MAC_ADDRESS, mac, NULL);
-			g_byte_array_free (mac, TRUE);
-		}
-	}
-
-	return TRUE;
-}
-
-static gboolean
-spec_match_list (NMDevice *device, const GSList *specs)
-{
-	NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (device);
-	char *hwaddr;
-	gboolean matched;
-
-	hwaddr = nm_utils_hwaddr_ntoa (&priv->perm_hw_addr, ARPHRD_ETHER);
-	matched = nm_match_spec_hwaddr (specs, hwaddr);
-	g_free (hwaddr);
-
-	if (!matched && priv->subchannels)
-		matched = nm_match_spec_s390_subchannels (specs, priv->subchannels);
-
-	return matched;
-}
-
-static NMConnection *
-connection_match_config (NMDevice *self, const GSList *connections)
-{
-	const GSList *iter;
-	GSList *ether_matches;
-	NMConnection *match;
-
-	/* First narrow @connections down to those that match in their
-	 * NMSettingWired configuration.
-	 */
-	ether_matches = NULL;
-	for (iter = connections; iter; iter = iter->next) {
-		NMConnection *candidate = NM_CONNECTION (iter->data);
-
-		/* Can't assume 802.1x or PPPoE connections; they have too much state
-		 * that's impossible to get on-the-fly from PPPoE or the supplicant.
-		 */
-		if (   nm_connection_get_setting_802_1x (candidate)
-		    || nm_connection_get_setting_pppoe (candidate))
-			continue;
-
-		if (!match_ethernet_connection (self, candidate, FALSE, NULL))
-			continue;
-
-		ether_matches = g_slist_prepend (ether_matches, candidate);
-	}
-
-	/* Now pass those to the super method, which will check IP config */
-	ether_matches = g_slist_reverse (ether_matches);
-	match = NM_DEVICE_CLASS (nm_device_ethernet_parent_class)->connection_match_config (self, ether_matches);
-	g_slist_free (ether_matches);
-
-	return match;
-}
-
-static gboolean
-hwaddr_matches (NMDevice *device,
-                NMConnection *connection,
-                const guint8 *other_hwaddr,
-                guint other_hwaddr_len,
-                gboolean fail_if_no_hwaddr)
-{
-	NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (device);
-	NMSettingWired *s_wired;
-	const GByteArray *mac = NULL;
-
-	s_wired = nm_connection_get_setting_wired (connection);
-	if (s_wired)
-		mac = nm_setting_wired_get_mac_address (s_wired);
-
-	if (mac) {
-		g_return_val_if_fail (mac->len == ETH_ALEN, FALSE);
-		if (other_hwaddr) {
-			g_return_val_if_fail (other_hwaddr_len == ETH_ALEN, FALSE);
-			if (memcmp (mac->data, other_hwaddr, mac->len) == 0)
-				return TRUE;
-		} else if (memcmp (mac->data, priv->hw_addr, mac->len) == 0)
-			return TRUE;
-	} else if (fail_if_no_hwaddr == FALSE)
-		return TRUE;
-
-	return FALSE;
-}
-
-static void
-dispose (GObject *object)
-{
-	NMDeviceEthernet *self = NM_DEVICE_ETHERNET (object);
-	NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (self);
-
-	g_free (priv->subchan1);
-	g_free (priv->subchan2);
-	g_free (priv->subchan3);
-	g_free (priv->subchannels);
-
-	G_OBJECT_CLASS (nm_device_ethernet_parent_class)->dispose (object);
-}
-
-static void
-get_property (GObject *object, guint prop_id,
-              GValue *value, GParamSpec *pspec)
-{
-	NMDeviceEthernet *self = NM_DEVICE_ETHERNET (object);
-	NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (self);
-
-	switch (prop_id) {
-	case PROP_HW_ADDRESS:
-		g_value_take_string (value, nm_utils_hwaddr_ntoa (priv->hw_addr, ARPHRD_ETHER));
-		break;
-	case PROP_PERM_HW_ADDRESS:
-		g_value_take_string (value, nm_utils_hwaddr_ntoa (&priv->perm_hw_addr, ARPHRD_ETHER));
-		break;
-	case PROP_SPEED:
-		g_value_set_uint (value, nm_device_wired_get_speed (NM_DEVICE_WIRED (self)));
-		break;
-	case PROP_CARRIER:
-		g_value_set_boolean (value, nm_device_wired_get_carrier (NM_DEVICE_WIRED (self)));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-set_property (GObject *object, guint prop_id,
-			  const GValue *value, GParamSpec *pspec)
-{
-	switch (prop_id) {
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-nm_device_ethernet_class_init (NMDeviceEthernetClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	NMDeviceClass *parent_class = NM_DEVICE_CLASS (klass);
-
-	g_type_class_add_private (object_class, sizeof (NMDeviceEthernetPrivate));
-
-	/* virtual methods */
-	object_class->constructor = constructor;
-	object_class->dispose = dispose;
-	object_class->get_property = get_property;
-	object_class->set_property = set_property;
-
-	parent_class->get_generic_capabilities = get_generic_capabilities;
-	parent_class->is_up = is_up;
-	parent_class->bring_up = bring_up;
-	parent_class->take_down = take_down;
-	parent_class->update_hw_address = update_hw_address;
-	parent_class->get_hw_address = get_hw_address;
-	parent_class->update_permanent_hw_address = update_permanent_hw_address;
-	parent_class->update_initial_hw_address = update_initial_hw_address;
-	parent_class->get_best_auto_connection = get_best_auto_connection;
-	parent_class->check_connection_compatible = check_connection_compatible;
-	parent_class->complete_connection = complete_connection;
-
-	parent_class->act_stage1_prepare = act_stage1_prepare;
-	parent_class->act_stage2_config = act_stage2_config;
-	parent_class->act_stage3_ip4_config_start = act_stage3_ip4_config_start;
-	parent_class->ip4_config_pre_commit = ip4_config_pre_commit;
-	parent_class->deactivate = deactivate;
-	parent_class->spec_match_list = spec_match_list;
-	parent_class->connection_match_config = connection_match_config;
-	parent_class->hwaddr_matches = hwaddr_matches;
-
-	parent_class->state_changed = device_state_changed;
-
-	/* properties */
-	g_object_class_install_property
-		(object_class, PROP_HW_ADDRESS,
-		 g_param_spec_string (NM_DEVICE_ETHERNET_HW_ADDRESS,
-							  "Active MAC Address",
-							  "Currently set hardware MAC address",
-							  NULL,
-							  G_PARAM_READABLE));
-
-	g_object_class_install_property
-		(object_class, PROP_PERM_HW_ADDRESS,
-		 g_param_spec_string (NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS,
-							  "Permanent MAC Address",
-							  "Permanent hardware MAC address",
-							  NULL,
-							  G_PARAM_READABLE));
-
-	g_object_class_install_property
-		(object_class, PROP_SPEED,
-		 g_param_spec_uint (NM_DEVICE_ETHERNET_SPEED,
-						   "Speed",
-						   "Speed",
-						   0, G_MAXUINT32, 0,
-						   G_PARAM_READABLE));
-
-	g_object_class_install_property
-		(object_class, PROP_CARRIER,
-		 g_param_spec_boolean (NM_DEVICE_ETHERNET_CARRIER,
-							   "Carrier",
-							   "Carrier",
-							   FALSE,
-							   G_PARAM_READABLE));
-
-	/* Signals */
-	signals[PROPERTIES_CHANGED] = 
-		nm_properties_changed_signal_new (object_class,
-								    G_STRUCT_OFFSET (NMDeviceEthernetClass, properties_changed));
-
-	dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (klass),
-									 &dbus_glib_nm_device_ethernet_object_info);
-
-	dbus_g_error_domain_register (NM_ETHERNET_ERROR, NULL, NM_TYPE_ETHERNET_ERROR);
-}
-
-
-/**************************************/
-/*    Ethtool capability detection    */
-/**************************************/
-
-static gboolean
-supports_ethtool_carrier_detect (NMDeviceEthernet *self)
-{
-	int fd;
-	struct ifreq ifr;
-	gboolean supports_ethtool = FALSE;
-	struct ethtool_cmd edata;
-
-	g_return_val_if_fail (self != NULL, FALSE);
-
-	fd = socket (PF_INET, SOCK_DGRAM, 0);
-	if (fd < 0) {
-		nm_log_err (LOGD_HW, "couldn't open control socket.");
-		return FALSE;
-	}
-
-	memset (&ifr, 0, sizeof (struct ifreq));
-	strncpy (ifr.ifr_name, nm_device_get_iface (NM_DEVICE (self)), IFNAMSIZ);
-
-	edata.cmd = ETHTOOL_GLINK;
-	ifr.ifr_data = (char *) &edata;
-
-	errno = 0;
-	if (ioctl (fd, SIOCETHTOOL, &ifr) < 0) {
-		nm_log_dbg (LOGD_HW | LOGD_ETHER, "SIOCETHTOOL failed: %d", errno);
-		goto out;
-	}
-
-	supports_ethtool = TRUE;
-
-out:
-	close (fd);
-	nm_log_dbg (LOGD_HW | LOGD_ETHER, "ethtool %s supported",
-	            supports_ethtool ? "is" : "not");
-	return supports_ethtool;
-}
-
-
-/**************************************/
-/*    MII capability detection        */
-/**************************************/
-#define _LINUX_IF_H
-#include <linux/mii.h>
-#undef _LINUX_IF_H
-
-static int
-mdio_read (NMDeviceEthernet *self, int fd, struct ifreq *ifr, int location)
-{
-	struct mii_ioctl_data *mii;
-	int val = -1;
-
-	g_return_val_if_fail (fd >= 0, -1);
-	g_return_val_if_fail (ifr != NULL, -1);
-
-	mii = (struct mii_ioctl_data *) &ifr->ifr_ifru;
-	mii->reg_num = location;
-
-	errno = 0;
-	if (ioctl (fd, SIOCGMIIREG, ifr) == 0) {
-		nm_log_dbg (LOGD_HW | LOGD_ETHER, "SIOCGMIIREG result 0x%X", mii->val_out);
-		val = mii->val_out;
-	} else {
-		nm_log_dbg (LOGD_HW | LOGD_ETHER, "SIOCGMIIREG failed: %d", errno);
-	}
-
-	return val;
-}
-
-static gboolean
-supports_mii_carrier_detect (NMDeviceEthernet *self)
-{
-	int fd, bmsr;
-	struct ifreq ifr;
-	gboolean supports_mii = FALSE;
-
-	g_return_val_if_fail (self != NULL, FALSE);
-
-	fd = socket (PF_INET, SOCK_DGRAM, 0);
-	if (fd < 0) {
-		nm_log_err (LOGD_HW, "couldn't open control socket.");
-		return FALSE;
-	}
-
-	memset (&ifr, 0, sizeof (struct ifreq));
-	strncpy (ifr.ifr_name, nm_device_get_iface (NM_DEVICE (self)), IFNAMSIZ);
-
-	errno = 0;
-	if (ioctl (fd, SIOCGMIIPHY, &ifr) < 0) {
-		nm_log_dbg (LOGD_HW | LOGD_ETHER, "SIOCGMIIPHY failed: %d", errno);
-		goto out;
-	}
-
-	/* If we can read the BMSR register, we assume that the card supports MII link detection */
-	bmsr = mdio_read (self, fd, &ifr, MII_BMSR);
-	supports_mii = (bmsr != -1) ? TRUE : FALSE;
-	nm_log_dbg (LOGD_HW | LOGD_ETHER, "MII %s supported",
-	            supports_mii ? "is" : "not");
-
-out:
-	close (fd);
-	return supports_mii;	
-}