From 41c70c8c474859124d312e2f1ef0578cfbbbf32b Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Mon, 5 Sep 2016 20:11:44 +0000 Subject: [PATCH] Dodge more errors when deleting not available anymore. --- ipv4.c | 5 +++-- ipv6.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ipv4.c b/ipv4.c index 84504d40..80c9eb5b 100644 --- a/ipv4.c +++ b/ipv4.c @@ -882,8 +882,9 @@ ipv4_deladdr(struct ipv4_addr *addr, int keeparp) "%s: deleting IP address %s", addr->iface->name, addr->saddr); r = if_address(RTM_DELADDR, addr); - if (r == -1 && errno != EADDRNOTAVAIL && errno != ENXIO && - errno != ENODEV) + if (r == -1 && + errno != EADDRNOTAVAIL && errno != ESRCH && + errno != ENXIO && errno != ENODEV) logger(addr->iface->ctx, LOG_ERR, "%s: %s: %m", addr->iface->name, __func__); diff --git a/ipv6.c b/ipv6.c index 0df156ca..a43301d1 100644 --- a/ipv6.c +++ b/ipv6.c @@ -601,8 +601,9 @@ ipv6_deleteaddr(struct ipv6_addr *ia) logger(ia->iface->ctx, LOG_INFO, "%s: deleting address %s", ia->iface->name, ia->saddr); if (if_address6(RTM_DELADDR, ia) == -1 && - errno != EADDRNOTAVAIL && errno != ENXIO && errno != ENODEV) - logger(ia->iface->ctx, LOG_ERR, "if_address6: :%m"); + errno != EADDRNOTAVAIL && errno != ESRCH && + errno != ENXIO && errno != ENODEV) + logger(ia->iface->ctx, LOG_ERR, "if_address6: %m"); /* NOREJECT is set if we delegated exactly the prefix to another * address. -- 2.47.2