Merge pull request #3775 from pguibert6WIND/ospf_missing_interface_handling_2

[mirror_frr.git] / zebra / zebra_dplane.c

diff --git a/zebra/zebra_dplane.c b/zebra/zebra_dplane.c
index f93562b31b53a2263dc11d05b2455dc073b7efb5..e2128b1c8995ba94db8b2e4bc011d6bb49464635 100644 (file)
--- a/zebra/zebra_dplane.c
+++ b/zebra/zebra_dplane.c
@@ -1920,7 +1920,7 @@ enum zebra_dplane_result dplane_intf_addr_set(const struct interface *ifp,
                struct prefix_ipv4 *p;
 
                p = (struct prefix_ipv4 *)ifc->address;
-               rib_lookup_and_pushup(p, ifp->vrf_id);
+               rib_lookup_and_pushup(p, ifp->vrf->vrf_id);
        }
 #endif
 
@@ -1951,7 +1951,7 @@ static enum zebra_dplane_result intf_addr_update_internal(
                prefix2str(ifc->address, addr_str, sizeof(addr_str));
 
                zlog_debug("init intf ctx %s: idx %d, addr %u:%s",
-                          dplane_op2str(op), ifp->ifindex, ifp->vrf_id,
+                          dplane_op2str(op), ifp->ifindex, ifp->vrf->vrf_id,
                           addr_str);
        }
 
@@ -1959,9 +1959,9 @@ static enum zebra_dplane_result intf_addr_update_internal(
 
        ctx->zd_op = op;
        ctx->zd_status = ZEBRA_DPLANE_REQUEST_SUCCESS;
-       ctx->zd_vrf_id = ifp->vrf_id;
+       ctx->zd_vrf_id = ifp->vrf->vrf_id;
 
-       zns = zebra_ns_lookup(ifp->vrf_id);
+       zns = zebra_ns_lookup(ifp->vrf->vrf_id);
        dplane_ctx_ns_init(ctx, zns, false);
 
        /* Init the interface-addr-specific area */