fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-06 16:20:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

device: use _LOG() logging macros for per-device logging

Browse source
This commit is contained in:
Thomas Haller 2015-10-05 13:05:05 +02:00
parent 6b40108418
commit bb9d4b0ad1
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/devices/nm-device.c
View file

@ -8701,15 +8701,14 @@ deactivate_async_ready (NMDevice *self,
/* If operation cancelled, just return */
if ( g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)
|| (priv->deactivating_cancellable && g_cancellable_is_cancelled (priv->deactivating_cancellable))) {
nm_log_warn (LOGD_DEVICE, "Deactivation (%s) cancelled",
nm_device_get_iface (self));
_LOGW (LOGD_DEVICE, "Deactivation cancelled");
}
/* In every other case, transition to the DISCONNECTED state */
else {
if (error)
nm_log_warn (LOGD_DEVICE, "Deactivation (%s) failed: %s",
nm_device_get_iface (self),
error->message);
if (error) {
_LOGW (LOGD_DEVICE, "Deactivation failed: %s",
error->message);
}
nm_device_queue_state (self, NM_DEVICE_STATE_DISCONNECTED, reason);
}