]> git.proxmox.com Git - mirror_frr.git/commitdiff
isisd: do not disable circuit on ifdown
authorEmanuele Di Pascale <emanuele@voltanet.io>
Wed, 19 Feb 2020 16:37:21 +0000 (17:37 +0100)
committerEmanuele Di Pascale <emanuele@voltanet.io>
Wed, 19 Feb 2020 17:34:45 +0000 (18:34 +0100)
when zebra detects that an interface is gone, notify the circuit but do
not disable it - the interface is still configured until it isn't.

Without this fix, removing the interface in the kernel and then removing
the circuit from the configuration would cause an assertion in isis_csm.c:78

Signed-off-by: Emanuele Di Pascale <emanuele@voltanet.io>
isisd/isis_circuit.c

index 8343f7d85fe59565b7d0ebee21286e18b64ba0cb..e4152a8712d203b38060fc3a944dd942a4e8f1d0 100644 (file)
@@ -1386,7 +1386,6 @@ int isis_if_delete_hook(struct interface *ifp)
        if (ifp && ifp->info) {
                circuit = ifp->info;
                isis_csm_state_change(IF_DOWN_FROM_Z, circuit, circuit->area);
-               isis_csm_state_change(ISIS_DISABLE, circuit, circuit->area);
        }
 
        return 0;