diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2019-09-19 05:07:44 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2019-09-19 19:34:06 +0200 |
| commit | ddbf3e60604019d4b38d51226700e2244cc531b6 (patch) | |
| tree | d3403922091432832dfffe8b86e8c6610691e177 /isisd | |
| parent | *: Switch all zclient->interface_add to interface create callback (diff) | |
| download | frr-ddbf3e60604019d4b38d51226700e2244cc531b6.tar.xz frr-ddbf3e60604019d4b38d51226700e2244cc531b6.zip | |
*: Convert from ->interface_up to the interface callback
For all the places we have a zclient->interface_up convert
them to use the interface ifp_up callback instead.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'isisd')
| -rw-r--r-- | isisd/isis_circuit.c | 2 | ||||
| -rw-r--r-- | isisd/isis_zebra.c | 15 |
2 files changed, 2 insertions, 15 deletions
diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c index c78554e5e..ce3e972e4 100644 --- a/isisd/isis_circuit.c +++ b/isisd/isis_circuit.c @@ -1404,6 +1404,8 @@ static int isis_ifp_create(struct interface *ifp) static int isis_ifp_up(struct interface *ifp) { + isis_csm_state_change(IF_UP_FROM_Z, circuit_scan_by_ifp(ifp), ifp); + return 0; } diff --git a/isisd/isis_zebra.c b/isisd/isis_zebra.c index ea4622db3..5309a220a 100644 --- a/isisd/isis_zebra.c +++ b/isisd/isis_zebra.c @@ -98,20 +98,6 @@ static int isis_zebra_if_del(ZAPI_CALLBACK_ARGS) return 0; } -static int isis_zebra_if_state_up(ZAPI_CALLBACK_ARGS) -{ - struct interface *ifp; - - ifp = zebra_interface_state_read(zclient->ibuf, vrf_id); - - if (ifp == NULL) - return 0; - - isis_csm_state_change(IF_UP_FROM_Z, circuit_scan_by_ifp(ifp), ifp); - - return 0; -} - static int isis_zebra_if_state_down(ZAPI_CALLBACK_ARGS) { struct interface *ifp; @@ -372,7 +358,6 @@ void isis_zebra_init(struct thread_master *master) zclient->zebra_connected = isis_zebra_connected; zclient->router_id_update = isis_router_id_update_zebra; zclient->interface_delete = isis_zebra_if_del; - zclient->interface_up = isis_zebra_if_state_up; zclient->interface_down = isis_zebra_if_state_down; zclient->interface_address_add = isis_zebra_if_address_add; zclient->interface_address_delete = isis_zebra_if_address_del; |