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

core: ignore carrier disconnect in UNMANAGED state

Browse source 
Prevent this warning:

NetworkManager[3149]: <info> caught signal 2, shutting down normally.
NetworkManager[3149]: <info> (p4p1): device state change: disconnected -> unmanaged (reason 'removed') [30 10 36]
NetworkManager[3149]: <info> (p4p1): link disconnected
NetworkManager[3149]: <info> (p4p1.5): device state change: activated -> unmanaged (reason 'removed') [100 10 36]
NetworkManager[3149]: <info> (p4p1.5): deactivating device (reason 'removed') [36]
NetworkManager[3149]: <info> (p4p1.5): link disconnected
NetworkManager[3149]: carrier_changed: assertion `priv->state >= NM_DEVICE_STATE_UNAVAILABLE' failed
NetworkManager[3149]: <info> (wlp12s0): device state change: disconnected -> unmanaged (reason 'removed') [30 10 36]
NetworkManager[3149]: <info> exiting (success)
This commit is contained in:
Dan Williams 2014-07-03 12:11:07 -05:00
parent 55a0f25aba
commit 8dc5ef4b29
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -901,12 +901,10 @@ carrier_changed (NMDevice *device, gboolean carrier)
nm_device_emit_recheck_auto_activate (device);
}
} else {
g_return_if_fail (priv->state >= NM_DEVICE_STATE_UNAVAILABLE);
if (priv->state == NM_DEVICE_STATE_UNAVAILABLE) {
if (nm_device_queued_state_peek (device) >= NM_DEVICE_STATE_DISCONNECTED)
nm_device_queued_state_clear (device);
} else {
} else if (priv->state >= NM_DEVICE_STATE_DISCONNECTED) {
nm_device_queue_state (device, NM_DEVICE_STATE_UNAVAILABLE,
NM_DEVICE_STATE_REASON_CARRIER);
}