]> git.puffer.fish Git - mirror/frr.git/commitdiff
isisd: Remove impossible check
authorDonald Sharp <sharpd@cumulusnetworks.com>
Sat, 17 Feb 2018 19:52:44 +0000 (14:52 -0500)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Sat, 17 Feb 2018 19:52:44 +0000 (14:52 -0500)
The circuit->area value is always true in every code path
to isis_circuit_af_set( isis_vty.c ).  Therefore was_enabled
will always be true.

If was_enabled ever became false then the area->ip_circuits
and area->ipv6_circuits lines would segfault.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
isisd/isis_circuit.c

index 98087942a670bcddfb03d8462da30cb3c59f4955..20ce0f1fade63f7ba8c806240f170ffdb5730c10 100644 (file)
@@ -1168,7 +1168,6 @@ void isis_circuit_af_set(struct isis_circuit *circuit, bool ip_router,
        struct isis_area *area = circuit->area;
        bool change = circuit->ip_router != ip_router
                      || circuit->ipv6_router != ipv6_router;
-       bool was_enabled = !!circuit->area;
 
        area->ip_circuits += ip_router - circuit->ip_router;
        area->ipv6_circuits += ipv6_router - circuit->ipv6_router;
@@ -1182,8 +1181,6 @@ void isis_circuit_af_set(struct isis_circuit *circuit, bool ip_router,
 
        if (!ip_router && !ipv6_router)
                isis_csm_state_change(ISIS_DISABLE, circuit, area);
-       else if (!was_enabled)
-               isis_csm_state_change(ISIS_ENABLE, circuit, area);
        else
                lsp_regenerate_schedule(circuit->area, circuit->is_type, 0);
 }