From 013fef4c91375708794517b8872cb3016c5c52b0 Mon Sep 17 00:00:00 2001 From: Rafael Zalamena Date: Fri, 12 Jun 2020 12:21:28 -0300 Subject: [PATCH] zebra,fpm: fix force disable next hop groups `force_nhg` is only settable when calling from `fpm`, so if the kernel was using next hop groups it would override our knob. Signed-off-by: Rafael Zalamena --- zebra/rt_netlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c index 9883e73876..40a7eeba8e 100644 --- a/zebra/rt_netlink.c +++ b/zebra/rt_netlink.c @@ -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,