commit 4c7d7173baa9fe064349f5fe2e0bdcb367475499
author David Lamparter <equinox@opensourcerouting.org> Sat Aug 13 01:32:52 2016 +0200
committer Paul Jakma <paul.jakma@hpe.com> Tue Oct 04 13:07:55 2016 +0100
tree d1543cb7c7180e733f5e1561b69dcb23a427def7
parent 1187e25191b38a1876fafbfd733a70942ebcb062

isisd: fold up isis_circuit_is_type_set()

see previous commit.

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

isisd/isis_circuit.c

diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c
index 4750c5c..85a682d 100644
--- a/isisd/isis_circuit.c
+++ b/isisd/isis_circuit.c
@@ -1283,13 +1283,6 @@
   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)
 {

isisd/isis_events.c

diff --git a/isisd/isis_events.c b/isisd/isis_events.c
index ebd86a5..abc4471 100644
--- a/isisd/isis_events.c
+++ b/isisd/isis_events.c
@@ -147,7 +147,7 @@
 }
 
 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)
   {

isisd/isisd.c

diff --git a/isisd/isisd.c b/isisd/isisd.c
index df99cd1..9844ae5 100644
--- a/isisd/isisd.c
+++ b/isisd/isisd.c
@@ -1778,7 +1778,7 @@
   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);