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

device: add the internal interface state to the state change log message

Browse source 
(cherry picked from commit 55b8ba4ddc)
This commit is contained in:
Francesco Giudici 2017-05-19 15:35:29 +02:00
parent 3fefef8594
commit 3c7c273836
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6222,7 +6222,6 @@ ip6_config_merge_and_apply (NMDevice *self,
}
}
/* If no config was passed in, create a new one */
composite = nm_ip6_config_new (nm_device_get_ip_ifindex (self));
nm_ip6_config_set_privacy (composite,
priv->ndisc ?
@ -12449,24 +12448,20 @@ _set_state_full (NMDevice *self,
if ( (priv->state == state)
&& ( state != NM_DEVICE_STATE_UNAVAILABLE
|| !priv->firmware_missing)) {
_LOGD (LOGD_DEVICE, "state change: %s -> %s (reason '%s') [%d %d %d]%s",
_LOGD (LOGD_DEVICE, "state change: %s -> %s (reason '%s', internal state '%s'%s)",
state_to_string (old_state),
state_to_string (state),
reason_to_string (reason),
old_state,
state,
reason,
priv->firmware_missing ? " (missing firmware)" : "");
_sys_iface_state_to_str (priv->sys_iface_state),
priv->firmware_missing ? ", missing firmware" : "");
return;
}
_LOGI (LOGD_DEVICE, "state change: %s -> %s (reason '%s') [%d %d %d]",
_LOGI (LOGD_DEVICE, "state change: %s -> %s (reason '%s', internal state '%s')",
state_to_string (old_state),
state_to_string (state),
reason_to_string (reason),
old_state,
state,
reason);
_sys_iface_state_to_str (priv->sys_iface_state));
priv->in_state_changed = TRUE;