Merge pull request #6719 from opensourcerouting/fpm-force-nhg-fix

zebra,fpm: fix force disable next hop groups
This commit is contained in:
Donald Sharp 2020-07-13 08:48:49 -04:00 committed by GitHub
commit ab05b7f6bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1713,7 +1713,7 @@ ssize_t netlink_route_multipath_msg_encode(int cmd,
nl_attr_nest_end(&req->n, nest);
}
if (kernel_nexthops_supported() || force_nhg) {
if ((!fpm && kernel_nexthops_supported()) || (fpm && force_nhg)) {
/* Kernel supports nexthop objects */
if (IS_ZEBRA_DEBUG_KERNEL)
zlog_debug("%s: %pFX nhg_id is %u", __func__, p,