Merge pull request #5327 from lkrishnamoor/rm_rd_filter

[mirror_frr.git] / staticd / static_routes.c

diff --git a/staticd/static_routes.c b/staticd/static_routes.c
index a8a5ca523a279e0f12061317696157794825994a..e8d6a4289b971f3c6b6f97b310d9370fe537549f 100644 (file)
--- a/staticd/static_routes.c
+++ b/staticd/static_routes.c
@@ -310,10 +310,14 @@ static void static_ifindex_update_af(struct interface *ifp, bool up, afi_t afi,
                                if (up) {
                                        if (strcmp(si->ifname, ifp->name))
                                                continue;
+                                       if (si->nh_vrf_id != ifp->vrf_id)
+                                               continue;
                                        si->ifindex = ifp->ifindex;
                                } else {
                                        if (si->ifindex != ifp->ifindex)
                                                continue;
+                                       if (si->nh_vrf_id != ifp->vrf_id)
+                                               continue;
                                        si->ifindex = IFINDEX_INTERNAL;
                                }