summaryrefslogtreecommitdiffstats
path: root/isisd
diff options
context:
space:
mode:
authorRenato Westphal <renato@opensourcerouting.org>2017-10-03 03:06:03 +0200
committerRenato Westphal <renato@opensourcerouting.org>2017-10-10 14:05:02 +0200
commit8928a08f657948c5d04807de399b89051ae54d88 (patch)
tree9639d1a05de75c6fac58dea45d3807d471f10ab4 /isisd
parent*: use rb-trees to store interfaces instead of sorted linked-lists (diff)
downloadfrr-8928a08f657948c5d04807de399b89051ae54d88.tar.xz
frr-8928a08f657948c5d04807de399b89051ae54d88.zip
*: eliminate IFINDEX_DELETED in favor of IFINDEX_INTERNAL
IFINDEX_DELETED is not necessary anymore as we moved from a global list of interfaces to a list of interfaces per VRF. This reverts commit 84361d615. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
Diffstat (limited to 'isisd')
-rw-r--r--isisd/isis_circuit.c3
-rw-r--r--isisd/isis_zebra.c2
2 files changed, 1 insertions, 4 deletions
diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c
index 761e73aa8..939dc71be 100644
--- a/isisd/isis_circuit.c
+++ b/isisd/isis_circuit.c
@@ -941,9 +941,6 @@ int isis_interface_config_write(struct vty *vty)
int i;
RB_FOREACH (ifp, if_name_head, &vrf->ifaces_by_name) {
- if (ifp->ifindex == IFINDEX_DELETED)
- continue;
-
/* IF name */
vty_frame(vty, "interface %s\n", ifp->name);
write++;
diff --git a/isisd/isis_zebra.c b/isisd/isis_zebra.c
index bc8131409..7109bfb11 100644
--- a/isisd/isis_zebra.c
+++ b/isisd/isis_zebra.c
@@ -128,7 +128,7 @@ static int isis_zebra_if_del(int command, struct zclient *zclient,
in case there is configuration info attached to it. */
if_delete_retain(ifp);
- ifp->ifindex = IFINDEX_DELETED;
+ ifp->ifindex = IFINDEX_INTERNAL;
return 0;
}