diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2019-06-23 19:47:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-23 19:47:10 -0400 |
| commit | 0c3bbed4e670a24134bd0bcb18b56634c542fcf5 (patch) | |
| tree | fb34f0ca1836e09a8e89e73ebd6696a08b89b631 /ospfd/ospf_interface.c | |
| parent | a12bb225a6681b7e7eb0aac105cbc8b745675131 (diff) | |
| parent | a36898e7555036c786f7aa944b848966b45d5897 (diff) | |
Merge pull request #4597 from FRRouting/revert-3775-ospf_missing_interface_handling_2
Revert "Ospf missing interface handling 2"
Diffstat (limited to 'ospfd/ospf_interface.c')
| -rw-r--r-- | ospfd/ospf_interface.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/ospfd/ospf_interface.c b/ospfd/ospf_interface.c index 6516129c5d..ce1604a5b1 100644 --- a/ospfd/ospf_interface.c +++ b/ospfd/ospf_interface.c @@ -349,8 +349,8 @@ void ospf_if_free(struct ospf_interface *oi) if (IS_DEBUG_OSPF_EVENT) zlog_debug("%s: ospf interface %s vrf %s id %u deleted", __PRETTY_FUNCTION__, oi->ifp->name, - vrf_to_name(oi->ifp->vrf), - vrf_to_id(oi->ifp->vrf)); + ospf_vrf_id_to_name(oi->ifp->vrf_id), + oi->ifp->vrf_id); ospf_delete_from_if(oi->ifp, oi); @@ -838,7 +838,6 @@ struct ospf_interface *ospf_vl_new(struct ospf *ospf, struct in_addr area_id; struct connected *co; struct prefix_ipv4 *p; - struct vrf *vrf; if (IS_DEBUG_OSPF_EVENT) zlog_debug("ospf_vl_new(): Start"); @@ -856,8 +855,7 @@ struct ospf_interface *ospf_vl_new(struct ospf *ospf, ospf->vrf_id); snprintf(ifname, sizeof(ifname), "VLINK%u", vlink_count); - vrf = vrf_lookup_by_id(ospf->vrf_id); - vi = if_create(ifname, vrf); + vi = if_create(ifname, ospf->vrf_id); /* * if_create sets ZEBRA_INTERFACE_LINKDETECTION * virtual links don't need this. |