diff options
| author | Jiří Klimeš <jklimes@redhat.com> | 2013-11-18 12:57:04 +0100 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2013-11-18 14:24:10 -0600 |
| commit | f93c15416152c1d071102cce716d82a1d3616c44 (patch) | |
| tree | 60e5df56e42d5f37041d8ab43d9fbdec2fb855cf | |
| parent | 044cebade409fa2a19f7744a0693046459538f92 (diff) | |
| download | NetworkManager-f93c15416152c1d071102cce716d82a1d3616c44.tar.gz | |
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.
<info> Activation (nm-team) Stage 1 of 5 (Device Prepare) started...
<warn> Activation (nm-team) to start teamd: not found
<info> (nm-team): device state change: prepare -> failed (reason 'none') [40 120 0]
...
<debug> master_state_cb(): (0x81d6968): master ActiveConnection [0x91d69d0] 'team0' failed
<info> (eth1): device state change: config -> failed (reason 'dependency-failed') [50 120 50]
...
<debug> slave_state_changed(): (nm-team): slave eth1 state change 50 (config) -> 120 (failed)
--- ASSERTION ---
| -rw-r--r-- | src/devices/nm-device.c | 1 |
1 files changed, 0 insertions, 1 deletions
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) |