diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2016-08-13 01:32:52 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2016-08-19 13:33:51 -0400 |
| commit | f1d489ea29240037c6579d2ee5134dce11b7d511 (patch) | |
| tree | 2108575ee114798fdc06d46be1ed8fcc01893129 | |
| parent | 791ffe38a5e87236fef7943b28d4db7caca768b4 (diff) | |
isisd: fold up isis_circuit_is_type_set()
see previous commit.
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
| -rw-r--r-- | isisd/isis_circuit.c | 7 | ||||
| -rw-r--r-- | isisd/isis_events.c | 2 | ||||
| -rw-r--r-- | isisd/isisd.c | 2 |
3 files changed, 2 insertions, 9 deletions
diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c index 300c2cd85e..efed420161 100644 --- 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 8fb92fdd39..460b1d25ba 100644 --- 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 62c5e26538..0d0b805a20 100644 --- 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); |