From 409c0fb544913ca36e262cab0032fb2341851cd5 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Mon, 16 Mar 2015 18:27:35 +0100 Subject: [PATCH] device: fix a couple of copy & paste errors (cherry picked from commit a8a9955d756838a8592162de86cde1149de1ca09) --- src/devices/nm-device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 7bb201191c..78d4a60968 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -4483,7 +4483,7 @@ act_stage3_ip6_config_start (NMDevice *self, connection = nm_device_get_connection (self); g_assert (connection); - if ( connection_ip4_method_requires_carrier (connection, NULL) + if ( connection_ip6_method_requires_carrier (connection, NULL) && priv->is_master && !priv->carrier) { _LOGI (LOGD_IP6 | LOGD_DEVICE, @@ -6033,7 +6033,7 @@ nm_device_set_ip6_config (NMDevice *self, nm_ip6_config_export (new_config); } - _LOGD (LOGD_IP4, "set IP6Config instance (%s)", + _LOGD (LOGD_IP6, "set IP6Config instance (%s)", nm_ip6_config_get_dbus_path (new_config)); } } else if (old_config) {