about summary refs log tree commit diff
path: root/src/nm-device-ethernet.c
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2011-04-04 22:36:17 +0200
committerMichael Biebl <biebl@debian.org>2011-04-04 22:36:17 +0200
commitc08b7f120a78b1be36e15d2d5fa2b05637f56b92 (patch)
treebbdc1f76b481f8a0d7e329472a415863187b53e6 /src/nm-device-ethernet.c
parentcc5124a8a78d6854e630cb69322abd4d38011e2b (diff)
parentc980bdf58dc973dd5617aaa6f9466f9e44fcbf58 (diff)
Merge commit 'upstream/0.8.3.999'
Diffstat (limited to 'src/nm-device-ethernet.c')
-rw-r--r--src/nm-device-ethernet.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/nm-device-ethernet.c b/src/nm-device-ethernet.c
index 49e58887..c4f62f39 100644
--- a/src/nm-device-ethernet.c
+++ b/src/nm-device-ethernet.c
@@ -371,7 +371,7 @@ _update_s390_subchannels (NMDeviceEthernet *self)
 				priv->subchan3 = g_path_get_basename (buf);
 		} else {
 			nm_log_warn (LOGD_DEVICE | LOGD_HW,
-			             "(%s): failed to read cdev link '%s': %s",
+			             "(%s): failed to read cdev link '%s': %d",
 			             iface, cdev_path, errno);
 		}
 		g_free (cdev_path);
@@ -681,8 +681,7 @@ _set_hw_addr (NMDeviceEthernet *self, const guint8 *addr, const char *detail)
 
 	/* 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, detail, mac_str);
+		nm_log_dbg (LOGD_DEVICE | LOGD_ETHER, "(%s): no MAC address change needed", iface);
 		g_free (mac_str);
 		return TRUE;
 	}