Commit a6490db9 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)
parent 18700388
Pipeline #199868 passed with stage
in 51 minutes and 25 seconds
......@@ -10527,7 +10527,7 @@ activate_stage4_ip_config_timeout_4 (NMDevice *self)
NMActStageReturn ret = NM_ACT_STAGE_RETURN_FAILURE;
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)
return;
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