diff options
| author | Michael Biebl <biebl@debian.org> | 2011-05-04 21:35:57 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2011-05-04 21:35:57 +0200 |
| commit | 3241555aff5c969104e492501097f4cb8837bcca (patch) | |
| tree | 6d15a02d02a9f1bfcda6075ae2b8c71537d8038d /src/nm-system.c | |
| parent | e1b66c145e71e7bc6a06845dd17788fb7b8e158e (diff) | |
| parent | 9f806e97a24bba61417ae312fcc0da40914266fb (diff) | |
Merge commit 'upstream/0.8.999' into experimental
Diffstat (limited to 'src/nm-system.c')
| -rw-r--r-- | src/nm-system.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nm-system.c b/src/nm-system.c index e8b8fec1..88db6596 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]); |