diff options
| author | Stephen Worley <sworley@cumulusnetworks.com> | 2019-05-15 00:47:20 +0200 |
|---|---|---|
| committer | Stephen Worley <sworley@cumulusnetworks.com> | 2019-10-25 17:13:40 +0200 |
| commit | 2f65aee06ad31d720a316f9d7dee90dcdaebcd41 (patch) | |
| tree | c9e182386d209f5ad24585e11e9ee7c19bf7ebed /zebra/kernel_netlink.c | |
| parent | zebra: Return true if the NHE created, not found (diff) | |
| download | frr-2f65aee06ad31d720a316f9d7dee90dcdaebcd41.tar.xz frr-2f65aee06ad31d720a316f9d7dee90dcdaebcd41.zip | |
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>
Diffstat (limited to '')
| -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 a81788028..23f1a3bf8 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; } |