Browse Source

isisd: fold up isis_circuit_is_type_set()

see previous commit.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
David Lamparter 2 years ago
parent
commit
4c7d7173ba
3 changed files with 2 additions and 9 deletions
  1. 0 7
      isisd/isis_circuit.c
  2. 1 1
      isisd/isis_events.c
  3. 1 1
      isisd/isisd.c

+ 0 - 7
isisd/isis_circuit.c

@@ -1283,13 +1283,6 @@ isis_circuit_passive_set (struct isis_circuit *circuit, bool passive)
   return 0;
 }
 
-void
-isis_circuit_is_type_set (struct isis_circuit *circuit, int is_type)
-{
-  if (circuit->is_type != is_type)
-    isis_event_circuit_type_change (circuit, is_type);
-}
-
 int
 isis_circuit_metric_set (struct isis_circuit *circuit, int level, int metric)
 {

+ 1 - 1
isisd/isis_events.c

@@ -147,7 +147,7 @@ circuit_resign_level (struct isis_circuit *circuit, int level)
 }
 
 void
-isis_event_circuit_type_change (struct isis_circuit *circuit, int newtype)
+isis_circuit_is_type_set (struct isis_circuit *circuit, int newtype)
 {
   if (circuit->state != C_STATE_UP)
   {

+ 1 - 1
isisd/isisd.c

@@ -1778,7 +1778,7 @@ isis_area_is_type_set(struct isis_area *area, int is_type)
   if (area->is_type != IS_LEVEL_1_AND_2)
   {
     for (ALL_LIST_ELEMENTS_RO (area->circuit_list, node, circuit))
-      isis_event_circuit_type_change (circuit, is_type);
+      isis_circuit_is_type_set (circuit, is_type);
   }
 
   spftree_area_init (area);