diff options
| author | Donald Sharp <donaldsharp72@gmail.com> | 2021-11-22 12:02:21 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-22 12:02:21 -0500 |
| commit | 9d5a61264ac44d82e63fb57d3e72305127ecbeab (patch) | |
| tree | 5da1c6475bb4615dc3f7ce401cf0ccb8bb2b8842 /isisd/isis_circuit.c | |
| parent | 7b532137c399fdd0bc9981cb6d749299f1ed56b2 (diff) | |
| parent | 608c887069173344b7bb6b1d3d4a59841ecdff4b (diff) | |
Merge pull request #10076 from idryzhov/if-is-loopback-or-vrf
*: unify if_is_loopback/if_is_loopback_or_vrf
Diffstat (limited to 'isisd/isis_circuit.c')
| -rw-r--r-- | isisd/isis_circuit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c index d0e8637c52..2fe89db2bf 100644 --- a/isisd/isis_circuit.c +++ b/isisd/isis_circuit.c @@ -487,7 +487,7 @@ void isis_circuit_if_add(struct isis_circuit *circuit, struct interface *ifp) circuit->circ_type = CIRCUIT_T_BROADCAST; } else if (if_is_pointopoint(ifp)) { circuit->circ_type = CIRCUIT_T_P2P; - } else if (if_is_loopback_or_vrf(ifp)) { + } else if (if_is_loopback(ifp)) { circuit->circ_type = CIRCUIT_T_LOOPBACK; circuit->is_passive = 1; } else { @@ -1305,7 +1305,7 @@ ferr_r isis_circuit_passive_set(struct isis_circuit *circuit, bool passive) if (circuit->is_passive == passive) return ferr_ok(); - if (if_is_loopback_or_vrf(circuit->interface) && !passive) + if (if_is_loopback(circuit->interface) && !passive) return ferr_cfg_invalid("loopback is always passive"); if (circuit->state != C_STATE_UP) { |