diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2020-07-13 08:48:49 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-13 08:48:49 -0400 |
| commit | ab05b7f6bd17e53fe4572c9ca65e94e2ff4f92ed (patch) | |
| tree | 3df0cb8f65607bb5cf761ba010f46152b8fdd1de | |
| parent | 14d09806da631350cbbd376c38406083fbde7dfd (diff) | |
| parent | 013fef4c91375708794517b8872cb3016c5c52b0 (diff) | |
Merge pull request #6719 from opensourcerouting/fpm-force-nhg-fix
zebra,fpm: fix force disable next hop groups
| -rw-r--r-- | zebra/rt_netlink.c | 2 |
1 files changed, 1 insertions, 1 deletions
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, |