From f93c15416152c1d071102cce716d82a1d3616c44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= Date: Mon, 18 Nov 2013 12:57:04 +0100 Subject: [PATCH] device: remove invalid assertion in slave_state_changed() When activating a team slave and 'teamd' binary is not installed, the priv->state of master device will be NM_DEVICE_STATE_FAILED, which is greater than NM_DEVICE_STATE_ACTIVATED. Activation (nm-team) Stage 1 of 5 (Device Prepare) started... Activation (nm-team) to start teamd: not found (nm-team): device state change: prepare -> failed (reason 'none') [40 120 0] ... master_state_cb(): (0x81d6968): master ActiveConnection [0x91d69d0] 'team0' failed (eth1): device state change: config -> failed (reason 'dependency-failed') [50 120 50] ... slave_state_changed(): (nm-team): slave eth1 state change 50 (config) -> 120 (failed) --- ASSERTION --- --- src/devices/nm-device.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index e18a65a096..cc678ce44a 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -1233,7 +1233,6 @@ slave_state_changed (NMDevice *slave, state_to_string (slave_new_state)); g_assert (priv->state > NM_DEVICE_STATE_DISCONNECTED); - g_assert (priv->state <= NM_DEVICE_STATE_ACTIVATED); /* Don't try to enslave slaves until the master is ready */ if (priv->state < NM_DEVICE_STATE_CONFIG)