From b7b5d562226119f5abe02c626f9233d3a4ae9b9d Mon Sep 17 00:00:00 2001 From: Christian Franke Date: Thu, 11 Aug 2016 16:08:05 +0200 Subject: [PATCH] isisd: fix network-type configuration Reported-by: Martin Winter Signed-off-by: David Lamparter --- isisd/isis_circuit.c | 1 - isisd/isis_vty.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c index ad1eca89e3..ac41b55b87 100644 --- a/isisd/isis_circuit.c +++ b/isisd/isis_circuit.c @@ -1358,7 +1358,6 @@ isis_circuit_circ_type_set(struct isis_circuit *circuit, int circ_type) * is not supported. */ if (circ_type == CIRCUIT_T_UNKNOWN || circ_type == CIRCUIT_T_LOOPBACK - || circuit->circ_type == CIRCUIT_T_UNKNOWN || circuit->circ_type == CIRCUIT_T_LOOPBACK) { if (circuit->circ_type != circ_type) diff --git a/isisd/isis_vty.c b/isisd/isis_vty.c index 3ce06b83da..f9b96a42d8 100644 --- a/isisd/isis_vty.c +++ b/isisd/isis_vty.c @@ -255,7 +255,7 @@ DEFUN (isis_network, if (!circuit) return CMD_ERR_NO_MATCH; - if (!isis_circuit_circ_type_set(circuit, CIRCUIT_T_P2P)) + if (isis_circuit_circ_type_set(circuit, CIRCUIT_T_P2P)) { vty_out (vty, "isis network point-to-point " "is valid only on broadcast interfaces%s", @@ -278,7 +278,7 @@ DEFUN (no_isis_network, if (!circuit) return CMD_ERR_NO_MATCH; - if (!isis_circuit_circ_type_set(circuit, CIRCUIT_T_BROADCAST)) + if (isis_circuit_circ_type_set(circuit, CIRCUIT_T_BROADCAST)) { vty_out (vty, "isis network point-to-point " "is valid only on broadcast interfaces%s", -- 2.39.5