Commit 3f29f993 authored by Beniamino Galvani's avatar Beniamino Galvani

device: fix wrongly considering ipv6.may-fail for ipv4

Fixes: 5e71f016 ('device: merge stage3 and stage4 ip-config function for IPv4 and IPv6')
(cherry picked from commit a0179362)
(cherry picked from commit 0adfcadc)
(cherry picked from commit 1438d5a9)
(cherry picked from commit 584f467e)
(cherry picked from commit a6490db9)
parent 9faed164
Pipeline #199869 passed with stage
in 55 minutes and 1 second
...@@ -10317,7 +10317,7 @@ activate_stage4_ip_config_timeout_4 (NMDevice *self) ...@@ -10317,7 +10317,7 @@ activate_stage4_ip_config_timeout_4 (NMDevice *self)
NMActStageReturn ret = NM_ACT_STAGE_RETURN_FAILURE; NMActStageReturn ret = NM_ACT_STAGE_RETURN_FAILURE;
NMDeviceStateReason failure_reason = NM_DEVICE_STATE_REASON_NONE; NMDeviceStateReason failure_reason = NM_DEVICE_STATE_REASON_NONE;
ret = NM_DEVICE_GET_CLASS (self)->act_stage4_ip_config_timeout (self, AF_INET6, &failure_reason); ret = NM_DEVICE_GET_CLASS (self)->act_stage4_ip_config_timeout (self, AF_INET, &failure_reason);
if (ret == NM_ACT_STAGE_RETURN_POSTPONE) if (ret == NM_ACT_STAGE_RETURN_POSTPONE)
return; return;
else if (ret == NM_ACT_STAGE_RETURN_FAILURE) { else if (ret == NM_ACT_STAGE_RETURN_FAILURE) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment