isisd: fix network-type configuration

Reported-by: Martin Winter <mwinter@opensourcerouting.org>
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c
index ad1eca89e3302af65bbeae1415b92539fe3ea2c4..ac41b55b872a5b92dbb5093e985da0f918ebea9f 100644 (file)
--- 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 3ce06b83dadb7bb46cdd2d8beb3a9bd00fdff197..f9b96a42d824442e702c427ff6cef4395c32c6d0 100644 (file)
--- 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",