]> git.puffer.fish Git - mirror/frr.git/commitdiff
zebra: force off kernel NHG install with netns VRFs 6336/head
authorStephen Worley <sworley@cumulusnetworks.com>
Fri, 1 May 2020 16:34:43 +0000 (12:34 -0400)
committerStephen Worley <sworley@cumulusnetworks.com>
Mon, 4 May 2020 14:47:09 +0000 (10:47 -0400)
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>
(cherry picked from commit d982012a0e7e77814b25381f634b64034d80c1ad)

zebra/rt_netlink.c

index ee8ef6558f961a8e57db8e4a5882ad6749d5b0d0..663d5c2070d7e63099b9730ca91798f302208a77 100644 (file)
@@ -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());
 }
 
 /*