From 2f65aee06ad31d720a316f9d7dee90dcdaebcd41 Mon Sep 17 00:00:00 2001 From: Stephen Worley Date: Tue, 14 May 2019 15:47:20 -0700 Subject: [PATCH] zebra: Don't error on nexthop object support check On startup when we are requesting all nexthop objects from the kernel and it doesn't support that, we should not produce an error message. Signed-off-by: Stephen Worley --- zebra/kernel_netlink.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/zebra/kernel_netlink.c b/zebra/kernel_netlink.c index a81788028e..23f1a3bf86 100644 --- a/zebra/kernel_netlink.c +++ b/zebra/kernel_netlink.c @@ -891,15 +891,20 @@ int netlink_parse_info(int (*filter)(struct nlmsghdr *, ns_id_t, int), msg_type, err->msg.nlmsg_seq, err->msg.nlmsg_pid); - } else - flog_err( - EC_ZEBRA_UNEXPECTED_MESSAGE, - "%s error: %s, type=%s(%u), seq=%u, pid=%u", - nl->name, - safe_strerror(-errnum), - nl_msg_type_to_str(msg_type), - msg_type, err->msg.nlmsg_seq, - err->msg.nlmsg_pid); + } else { + if ((msg_type != RTM_GETNEXTHOP) + || !startup) + flog_err( + EC_ZEBRA_UNEXPECTED_MESSAGE, + "%s error: %s, type=%s(%u), seq=%u, pid=%u", + nl->name, + safe_strerror(-errnum), + nl_msg_type_to_str( + msg_type), + msg_type, + err->msg.nlmsg_seq, + err->msg.nlmsg_pid); + } return -1; }