diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2019-06-24 01:46:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-24 01:46:39 +0200 |
| commit | a36898e7555036c786f7aa944b848966b45d5897 (patch) | |
| tree | fb34f0ca1836e09a8e89e73ebd6696a08b89b631 /ospf6d/ospf6_top.c | |
| parent | Merge pull request #3775 from pguibert6WIND/ospf_missing_interface_handling_2 (diff) | |
| download | frr-a36898e7555036c786f7aa944b848966b45d5897.tar.xz frr-a36898e7555036c786f7aa944b848966b45d5897.zip | |
Revert "Ospf missing interface handling 2"
Diffstat (limited to 'ospf6d/ospf6_top.c')
| -rw-r--r-- | ospf6d/ospf6_top.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c index bbc9247b0..40c612381 100644 --- a/ospf6d/ospf6_top.c +++ b/ospf6d/ospf6_top.c @@ -654,10 +654,9 @@ DEFUN (ospf6_interface_area, struct ospf6_interface *oi; struct interface *ifp; uint32_t area_id; - struct vrf *vrf = vrf_lookup_by_id(VRF_DEFAULT); /* find/create ospf6 interface */ - ifp = if_get_by_name(argv[idx_ifname]->arg, vrf); + ifp = if_get_by_name(argv[idx_ifname]->arg, VRF_DEFAULT); oi = (struct ospf6_interface *)ifp->info; if (oi == NULL) oi = ospf6_interface_create(ifp); @@ -715,8 +714,7 @@ DEFUN (no_ospf6_interface_area, struct interface *ifp; uint32_t area_id; - ifp = if_lookup_by_name(argv[idx_ifname]->arg, - vrf_lookup_by_id(VRF_DEFAULT)); + ifp = if_lookup_by_name(argv[idx_ifname]->arg, VRF_DEFAULT); if (ifp == NULL) { vty_out(vty, "No such interface %s\n", argv[idx_ifname]->arg); return CMD_SUCCESS; |