isisd: fold up isis_circuit_is_type_set()

see previous commit.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c
index 300c2cd85ee2ba6ff2d17905f0be0346bbac9c78..efed4201617b735b06182d3997adc7be58179c41 100644 (file)
--- a/isisd/isis_circuit.c
+++ b/isisd/isis_circuit.c
@@ -1284,13 +1284,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)
 {

diff --git a/isisd/isis_events.c b/isisd/isis_events.c
index 8fb92fdd399577a597276053efbeddfc3cc44cbd..460b1d25baa43b96f0827dd0a470c6a13da7e47c 100644 (file)
--- a/isisd/isis_events.c
+++ b/isisd/isis_events.c
@@ -145,7 +145,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)
   {

diff --git a/isisd/isisd.c b/isisd/isisd.c
index 62c5e2653817d849d87ca1833cca655540b95f56..0d0b805a202cd56cb995716a0d9e29b00b69b495 100644 (file)
--- a/isisd/isisd.c
+++ b/isisd/isisd.c
@@ -1775,7 +1775,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);