diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-06-02 16:49:56 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-06-22 11:37:37 +0200 |
| commit | 83d01d22e2c52245e4d7d46772f22909225b7f82 (patch) | |
| tree | f5564e9394b8b0f303946966518d063cd43f9837 | |
| parent | adc756c9bde28dee9e8e2425945afc0ffef339aa (diff) | |
| download | NetworkManager-th/master-no-ignore-carrier-pr18.tar.gz | |
fixup! device: handle carrier changes for master device differentlyth/master-no-ignore-carrier-pr18
| -rw-r--r-- | src/devices/nm-device.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index c8b0114afe..3abf46cb10 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -2257,22 +2257,9 @@ carrier_changed (NMDevice *self, gboolean carrier) if (nm_device_activate_ip6_state_in_wait (self)) nm_device_activate_stage3_ip6_start (self); } - } else { - /* Put master device into DISCONNECTED state if there is - * no carrier. This would mean that all slaves are still - * enslaved. This is nessesary to be able to reconnect - * when carrier appears. - */ - if (priv->state == NM_DEVICE_STATE_DISCONNECTED) { - if ( priv->queued_state.id - && priv->queued_state.state >= NM_DEVICE_STATE_PREPARE) - queued_state_clear (self); - } else { - nm_device_queue_state (self, NM_DEVICE_STATE_DISCONNECTED, - NM_DEVICE_STATE_REASON_CARRIER); - } + return; } - return; + /* fall-through and change state of device */ } else if (priv->is_enslaved && !carrier) { /* Slaves don't deactivate when they lose carrier; for * bonds/teams in particular that would be actively |