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 /ospf6d/ospf6_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 'ospf6d/ospf6_interface.c')
| -rw-r--r-- | ospf6d/ospf6_interface.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/ospf6d/ospf6_interface.c b/ospf6d/ospf6_interface.c index 114a56c952..692c84ad08 100644 --- a/ospf6d/ospf6_interface.c +++ b/ospf6d/ospf6_interface.c @@ -996,8 +996,7 @@ DEFUN (show_ipv6_ospf6_interface, struct interface *ifp; if (argc == 5) { - 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); @@ -1082,8 +1081,7 @@ DEFUN (show_ipv6_ospf6_interface_traffic, if (argv_find(argv, argc, "IFNAME", &idx_ifname)) { intf_name = argv[idx_ifname]->arg; - ifp = if_lookup_by_name(intf_name, - vrf_lookup_by_id(VRF_DEFAULT)); + ifp = if_lookup_by_name(intf_name, VRF_DEFAULT); if (ifp == NULL) { vty_out(vty, "No such Interface: %s\n", intf_name); return CMD_WARNING; @@ -1127,8 +1125,7 @@ DEFUN (show_ipv6_ospf6_interface_ifname_prefix, struct interface *ifp; struct ospf6_interface *oi; - 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_WARNING; @@ -2029,7 +2026,7 @@ DEFUN (clear_ipv6_ospf6_interface, } else /* Interface name is specified. */ { if ((ifp = if_lookup_by_name(argv[idx_ifname]->arg, - vrf_lookup_by_id(VRF_DEFAULT))) + VRF_DEFAULT)) == NULL) { vty_out(vty, "No such Interface: %s\n", argv[idx_ifname]->arg); |