fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-05 07:38:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

device: warn if we couldn't reapply the ip configuration

Browse source 
Coverity is suspicious and rightly so.
This commit is contained in:
Lubomir Rintel 2016-02-12 14:19:46 +01:00
parent 86a0a14687
commit d9218f6074
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/devices/nm-device.c
View file

@ -7174,8 +7174,10 @@ nm_device_reactivate_ip4_config (NMDevice *self,
priv->ip4_state = IP_WAIT;
if (!nm_device_activate_stage3_ip4_start (self))
_LOGW (LOGD_IP4, "Failed to apply IPv4 configuration");
} else
ip4_config_merge_and_apply (self, NULL, TRUE, NULL);
} else {
if (!ip4_config_merge_and_apply (self, NULL, TRUE, NULL))
_LOGW (LOGD_IP4, "Failed to reapply IPv4 configuration");
}
}
}
@ -7202,8 +7204,10 @@ nm_device_reactivate_ip6_config (NMDevice *self,
priv->ip6_state = IP_WAIT;
if (!nm_device_activate_stage3_ip6_start (self))
_LOGW (LOGD_IP6, "Failed to apply IPv6 configuration");
} else
ip6_config_merge_and_apply (self, TRUE, NULL);
} else {
if (!ip6_config_merge_and_apply (self, TRUE, NULL))
_LOGW (LOGD_IP4, "Failed to reapply IPv6 configuration");
}
}
}