diff options
Diffstat (limited to 'zebra/interface.c')
| -rw-r--r-- | zebra/interface.c | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/zebra/interface.c b/zebra/interface.c index 6125ff9a16..4211155c27 100644 --- a/zebra/interface.c +++ b/zebra/interface.c @@ -48,7 +48,6 @@ #include "zebra/rt_netlink.h" #include "zebra/interface.h" #include "zebra/zebra_vxlan.h" -#include "zebra/zebra_static.h" #define ZEBRA_PTM_SUPPORT @@ -577,7 +576,6 @@ void if_add_update(struct interface *ifp) "interface %s vrf %u index %d becomes active.", ifp->name, ifp->vrf_id, ifp->ifindex); - static_ifindex_update(ifp, true); } else { if (IS_ZEBRA_DEBUG_KERNEL) zlog_debug("interface %s vrf %u index %d is added.", @@ -736,8 +734,6 @@ void if_delete_update(struct interface *ifp) zlog_debug("interface %s vrf %u index %d is now inactive.", ifp->name, ifp->vrf_id, ifp->ifindex); - static_ifindex_update(ifp, false); - /* Delete connected routes from the kernel. */ if_delete_connected(ifp); @@ -777,8 +773,6 @@ void if_handle_vrf_change(struct interface *ifp, vrf_id_t vrf_id) old_vrf_id = ifp->vrf_id; - static_ifindex_update(ifp, false); - /* Uninstall connected routes. */ if_uninstall_connected(ifp); @@ -803,8 +797,6 @@ void if_handle_vrf_change(struct interface *ifp, vrf_id_t vrf_id) if (if_is_operative(ifp)) if_install_connected(ifp); - static_ifindex_update(ifp, true); - /* Due to connected route change, schedule RIB processing for both old * and new VRF. */ @@ -934,12 +926,6 @@ void if_up(struct interface *ifp) /* Install connected routes to the kernel. */ if_install_connected(ifp); - /* Install any static routes using this vrf interface */ - if (IS_ZEBRA_IF_VRF(ifp)) { - static_fixup_vrf_ids(zvrf); - static_config_install_delayed_routes(zvrf); - } - if (IS_ZEBRA_DEBUG_RIB_DETAILED) zlog_debug("%u: IF %s up, scheduling RIB processing", ifp->vrf_id, ifp->name); @@ -1417,7 +1403,7 @@ DEFUN (show_interface, interface_update_stats(); if (argc > 2) - VRF_GET_ID(vrf_id, argv[3]->arg); + VRF_GET_ID(vrf_id, argv[3]->arg, false); /* All interface print. */ vrf = vrf_lookup_by_id(vrf_id); @@ -1466,7 +1452,7 @@ DEFUN (show_interface_name_vrf, interface_update_stats(); - VRF_GET_ID(vrf_id, argv[idx_name]->arg); + VRF_GET_ID(vrf_id, argv[idx_name]->arg, false); /* Specified interface print. */ ifp = if_lookup_by_name(argv[idx_ifname]->arg, vrf_id); @@ -1560,7 +1546,7 @@ DEFUN (show_interface_desc, vrf_id_t vrf_id = VRF_DEFAULT; if (argc > 3) - VRF_GET_ID(vrf_id, argv[4]->arg); + VRF_GET_ID(vrf_id, argv[4]->arg, false); if_show_description(vty, vrf_id); |