diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2017-11-02 14:08:55 +0100 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2017-11-09 22:26:17 +0100 |
| commit | 14ad1d0cd105048a69f45ce58c41c788b45635d6 (patch) | |
| tree | 64e5550e266450614ae158dd0a2aedacba10fced | |
| parent | 9022b14478a9224ed0cd9e8f3b5a9997597abc46 (diff) | |
| download | NetworkManager-14ad1d0cd105048a69f45ce58c41c788b45635d6.tar.gz | |
device: don't necessarily fail the connection when ipv4 DAD fails
Don't necessarily fail the entire connection if a duplicate IPv4
address is detected, but instead look at the may-fail property and at
the outcome of IPv6.
https://bugzilla.redhat.com/show_bug.cgi?id=1508001
| -rw-r--r-- | src/devices/nm-device.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 8cf1efab53..7c3a408c06 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -5395,8 +5395,8 @@ ipv4_manual_method_apply (NMDevice *self, NMIP4Config **configs, gboolean succes nm_device_activate_schedule_ip4_config_result (self, empty); g_object_unref (empty); } else { - nm_device_queue_state (self, NM_DEVICE_STATE_FAILED, - NM_DEVICE_STATE_REASON_CONFIG_FAILED); + nm_device_ip_method_failed (self, AF_INET, + NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE); } } @@ -5976,8 +5976,8 @@ dhcp4_dad_cb (NMDevice *self, NMIP4Config **configs, gboolean success) if (success) nm_device_activate_schedule_ip4_config_result (self, configs[1]); else { - nm_device_state_changed (self, NM_DEVICE_STATE_FAILED, - NM_DEVICE_STATE_REASON_CONFIG_FAILED); + nm_device_ip_method_failed (self, AF_INET, + NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE); } } |