summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2016-02-12 14:19:46 +0100
committerLubomir Rintel <lkundrak@v3.sk>2016-02-12 15:48:12 +0100
commitd9218f607436ed66481a0276d49c464446b696df (patch)
tree077d30dee63402d8d0e1ff841ed084475f934b3b
parent86a0a14687093d3aaffc1435af96a51473cdd841 (diff)
downloadNetworkManager-d9218f607436ed66481a0276d49c464446b696df.tar.gz
device: warn if we couldn't reapply the ip configuration
Coverity is suspicious and rightly so.
-rw-r--r--src/devices/nm-device.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index cb575a763f..ce7e72fca0 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -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");
+ }
}
}