From 8dc5ef4b2959c9f0875cfefa436d2d8346013d73 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 3 Jul 2014 12:11:07 -0500 Subject: [PATCH] core: ignore carrier disconnect in UNMANAGED state Prevent this warning: NetworkManager[3149]: caught signal 2, shutting down normally. NetworkManager[3149]: (p4p1): device state change: disconnected -> unmanaged (reason 'removed') [30 10 36] NetworkManager[3149]: (p4p1): link disconnected NetworkManager[3149]: (p4p1.5): device state change: activated -> unmanaged (reason 'removed') [100 10 36] NetworkManager[3149]: (p4p1.5): deactivating device (reason 'removed') [36] NetworkManager[3149]: (p4p1.5): link disconnected NetworkManager[3149]: carrier_changed: assertion `priv->state >= NM_DEVICE_STATE_UNAVAILABLE' failed NetworkManager[3149]: (wlp12s0): device state change: disconnected -> unmanaged (reason 'removed') [30 10 36] NetworkManager[3149]: exiting (success) --- src/devices/nm-device.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 4ae1185a00..4788a604db 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -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); }