diff options
| author | Stephen Worley <sworley@cumulusnetworks.com> | 2019-05-14 15:47:20 -0700 |
|---|---|---|
| committer | Stephen Worley <sworley@cumulusnetworks.com> | 2019-10-25 11:13:40 -0400 |
| commit | 2f65aee06ad31d720a316f9d7dee90dcdaebcd41 (patch) | |
| tree | c9e182386d209f5ad24585e11e9ee7c19bf7ebed | |
| parent | 4505578be0304dd314e96e352be13d0925584497 (diff) | |
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 <sworley@cumulusnetworks.com>
| -rw-r--r-- | zebra/kernel_netlink.c | 23 |
1 files 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; } |