Merge pull request #5468 from qlyoung/bgpd-remove-bgp-attr-dup

[mirror_frr.git] / ospfd / ospf_interface.c

diff --git a/ospfd/ospf_interface.c b/ospfd/ospf_interface.c
index 3407d1bad145f97744e91f8d759ee65147ee8e8f..7ddffbcdbdc36d289b076f7a8ac27cd2d762cae1 100644 (file)
--- a/ospfd/ospf_interface.c
+++ b/ospfd/ospf_interface.c
@@ -273,7 +273,7 @@ struct ospf_interface *ospf_if_new(struct ospf *ospf, struct interface *ifp,
        if (IS_DEBUG_OSPF_EVENT)
                zlog_debug("%s: ospf interface %s vrf %s id %u created",
                           __PRETTY_FUNCTION__, ifp->name,
-                          ospf_vrf_id_to_name(ospf->vrf_id), ospf->vrf_id);
+                          ospf_get_name(ospf), ospf->vrf_id);
 
        return oi;
 }
@@ -832,7 +832,7 @@ struct ospf_interface *ospf_vl_new(struct ospf *ospf,
        struct prefix_ipv4 *p;
 
        if (IS_DEBUG_OSPF_EVENT)
-               zlog_debug("ospf_vl_new(): Start");
+               zlog_debug("ospf_vl_new()(%s): Start", ospf_get_name(ospf));
        if (vlink_count == OSPF_VL_MAX_COUNT) {
                if (IS_DEBUG_OSPF_EVENT)
                        zlog_debug(
@@ -847,9 +847,9 @@ struct ospf_interface *ospf_vl_new(struct ospf *ospf,
                        ospf->vrf_id);
 
        snprintf(ifname, sizeof(ifname), "VLINK%u", vlink_count);
-       vi = if_create(ifname, ospf->vrf_id);
+       vi = if_create_name(ifname, ospf->vrf_id);
        /*
-        * if_create sets ZEBRA_INTERFACE_LINKDETECTION
+        * if_create_name sets ZEBRA_INTERFACE_LINKDETECTION
         * virtual links don't need this.
         */
        UNSET_FLAG(vi->status, ZEBRA_INTERFACE_LINKDETECTION);
@@ -902,11 +902,10 @@ struct ospf_interface *ospf_vl_new(struct ospf *ospf,
 
 static void ospf_vl_if_delete(struct ospf_vl_data *vl_data)
 {
-       struct interface *ifp = vl_data->vl_oi->ifp;
        vl_data->vl_oi->address->u.prefix4.s_addr = 0;
        vl_data->vl_oi->address->prefixlen = 0;
        ospf_if_free(vl_data->vl_oi);
-       if_delete(ifp);
+       if_delete(&vl_data->vl_oi->ifp);
        vlink_count--;
 }