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

core: suppress error messages if addresses/routes already exist

Browse source
This commit is contained in:
Dan Williams 2011-04-05 10:19:08 -05:00
parent 5ca747316e
commit 5e21728e59
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/nm-device.c
View file

@ -1680,7 +1680,7 @@ dhcp6_start (NMDevice *self,
*/
err = nm_system_set_ip6_route (priv->ip_iface ? priv->ip_ifindex : priv->ifindex,
&dest, 8, NULL, 256, 0, RTPROT_BOOT, RT_TABLE_LOCAL, NULL);
if (err) {
if (err && (nl_get_errno () != EEXIST)) {
nm_log_err (LOGD_DEVICE | LOGD_IP6,
"(%s): failed to add IPv6 multicast route: %s",
priv->ip_iface ? priv->ip_iface : priv->iface, nl_geterror ());

4
src/nm-system.c
View file

@ -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]);