Merge pull request #5737 from mjstapp/zebra_disable_kern_nhs

[mirror_frr.git] / zebra / rt_netlink.c

diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c
index 32678ed664c92ed5811cdd1affc2674973ac570f..b1c679e06607738aaa8b77e82f190a817544ae78 100644 (file)
--- a/zebra/rt_netlink.c
+++ b/zebra/rt_netlink.c
@@ -2374,6 +2374,9 @@ int netlink_nexthop_change(struct nlmsghdr *h, ns_id_t ns_id, int startup)
 
        nhm = NLMSG_DATA(h);
 
+       if (ns_id)
+               vrf_id = ns_id;
+
        if (startup && h->nlmsg_type != RTM_NEWNEXTHOP)
                return 0;
 
@@ -2453,7 +2456,7 @@ int netlink_nexthop_change(struct nlmsghdr *h, ns_id_t ns_id, int startup)
                        return -1;
 
        } else if (h->nlmsg_type == RTM_DELNEXTHOP)
-               zebra_nhg_kernel_del(id);
+               zebra_nhg_kernel_del(id, vrf_id);
 
        return 0;
 }