From: Stephen Worley <sworley@cumulusnetworks.com>
Date: Fri, 1 May 2020 16:34:43 +0000 (-0400)
Subject: zebra: force off kernel NHG install with netns VRFs
X-Git-Tag: base_7.4~12^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=d982012a0e7e77814b25381f634b64034d80c1ad;p=mirror%2Ffrr.git

zebra: force off kernel NHG install with netns VRFs

Force off kernel NHG install with netns-based VRFs for
now. There is not really a good solution for allowing
kernel nexthop groups in namespaced based vrfs.

Signed-off-by: Stephen Worley <sworley@cumulusnetworks.com>
---

diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c
index 4630b8a8e9..535acda304 100644
--- a/zebra/rt_netlink.c
+++ b/zebra/rt_netlink.c
@@ -93,7 +93,8 @@ static struct in_addr ipv4_ll;
 /* Helper to control use of kernel-level nexthop ids */
 static bool kernel_nexthops_supported(void)
 {
-	return (supports_nh && zebra_nhg_kernel_nexthops_enabled());
+	return (supports_nh && !vrf_is_backend_netns()
+		&& zebra_nhg_kernel_nexthops_enabled());
 }
 
 /*