summaryrefslogtreecommitdiff
path: root/src/nm-system.c
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2011-04-21 10:42:53 +0200
committerMichael Biebl <biebl@debian.org>2011-04-21 10:42:53 +0200
commit8baa1aca8dfd35e3190d7d5655eb83b5b901e263 (patch)
treea9ac1e67d0c22a48330c76f08fc5291f85307055 /src/nm-system.c
parentf75dd6fd1975146623052b843b182dc32c3fbe46 (diff)
Imported Upstream version 0.8.4.0upstream/0.8.4.0
Diffstat (limited to 'src/nm-system.c')
-rw-r--r--src/nm-system.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nm-system.c b/src/nm-system.c
index e8b8fec11..88db65964 100644
--- a/src/nm-system.c
+++ b/src/nm-system.c
@@ -312,10 +312,10 @@ sync_addresses (const char *iface, int ifindex, int family,
}
err = rtnl_addr_add (nlh, addrs[i], 0);
- if (err < 0) {
+ if (err < 0 && (nl_get_errno () != EEXIST)) {
nm_log_err (log_domain,
"(%s): error %d returned from rtnl_addr_add():\n%s",
- iface, err, nl_geterror ());
+ iface, err, nl_geterror ());
}
rtnl_addr_put (addrs[i]);