Revert "Ospf missing interface handling 2"

[mirror_frr.git] / pimd / pim_zebra.c

diff --git a/pimd/pim_zebra.c b/pimd/pim_zebra.c
index eef36288d92ac27ec1a6e2c228ce7aa9ab9afdc4..4cebc43a0a0563d7c96de346d5833f640405d348 100644 (file)
--- a/pimd/pim_zebra.c
+++ b/pimd/pim_zebra.c
@@ -211,12 +211,11 @@ static int pim_zebra_if_state_up(ZAPI_CALLBACK_ARGS)
         */
        if (sscanf(ifp->name, "pimreg%" SCNu32, &table_id) == 1) {
                struct vrf *vrf;
-
                RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
                        if ((table_id == vrf->data.l.table_id)
-                           && (ifp->vrf != vrf)) {
+                           && (ifp->vrf_id != vrf->vrf_id)) {
                                struct interface *master = if_lookup_by_name(
-                                                            vrf->name, vrf);
+                                       vrf->name, vrf->vrf_id);
 
                                if (!master) {
                                        zlog_debug(
@@ -291,7 +290,7 @@ static int pim_zebra_interface_vrf_update(ZAPI_CALLBACK_ARGS)
                           __PRETTY_FUNCTION__,
                           ifp->name, vrf_id, new_vrf_id);
 
-       if_update_to_new_vrf(ifp, vrf_lookup_by_id(new_vrf_id));
+       if_update_to_new_vrf(ifp, new_vrf_id);
 
        return 0;
 }