From: Daniel Walton <dwalton@cumulusnetworks.com>
Date: Wed, 16 Mar 2016 20:56:15 +0000 (+0000)
Subject: quagga: Netlink error message following Notification send
X-Git-Tag: frr-2.0-rc1~1060
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=c5344534ff71e026b29c6905c9737e658efdd515;p=mirror%2Ffrr.git

quagga: Netlink error message following Notification send

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Reviewed-by:   Vivek Venkatraman <vivek@cumulusnetworks.com>

Ticket: CM-9501
---

diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c
index e6c726a93f..0ec4498276 100644
--- a/zebra/rt_netlink.c
+++ b/zebra/rt_netlink.c
@@ -58,6 +58,9 @@ static const struct message nlmsg_str[] = {
   {RTM_NEWADDR,  "RTM_NEWADDR"},
   {RTM_DELADDR,  "RTM_DELADDR"},
   {RTM_GETADDR,  "RTM_GETADDR"},
+  {RTM_NEWNEIGH, "RTM_NEWNEIGH"},
+  {RTM_DELNEIGH, "RTM_DELNEIGH"},
+  {RTM_GETNEIGH, "RTM_GETNEIGH"},
   {0, NULL}
 };
 
@@ -389,8 +392,13 @@ netlink_parse_info (int (*filter) (struct sockaddr_nl *, struct nlmsghdr *,
 		  return 0;
 		}
 
-	      if (nl == &zns->netlink_cmd
-		  && msg_type == RTM_NEWROUTE && -errnum == ESRCH)
+              /* We see RTM_DELNEIGH when shutting down an interface with an IPv4
+               * link-local.  The kernel should have already deleted the neighbor
+               * so do not log these as an error.
+               */
+              if (msg_type == RTM_DELNEIGH ||
+                  (nl == &zns->netlink_cmd && msg_type == RTM_NEWROUTE &&
+                   (-errnum == ESRCH || -errnum == ENETUNREACH)))
 		{
                   /* This is known to happen in some situations, don't log
                    * as error.