Merge pull request #12196 from opensourcerouting/xref-vtysh

[mirror_frr.git] / ripngd / ripng_nb_rpcs.c

diff --git a/ripngd/ripng_nb_rpcs.c b/ripngd/ripng_nb_rpcs.c
index 0396daf8905e1484d9d2bc705f7e9851f465b8b7..57a5f266884f78888310417e6d7a2ebff99c1de5 100644 (file)
--- a/ripngd/ripng_nb_rpcs.c
+++ b/ripngd/ripng_nb_rpcs.c
@@ -66,8 +66,8 @@ static void clear_ripng_route(struct ripng *ripng)
                }
 
                if (rinfo) {
-                       RIPNG_TIMER_OFF(rinfo->t_timeout);
-                       RIPNG_TIMER_OFF(rinfo->t_garbage_collect);
+                       THREAD_OFF(rinfo->t_timeout);
+                       THREAD_OFF(rinfo->t_garbage_collect);
                        listnode_delete(list, rinfo);
                        ripng_info_free(rinfo);
                }
@@ -80,13 +80,13 @@ static void clear_ripng_route(struct ripng *ripng)
        }
 }
 
-int clear_ripng_route_rpc(const char *xpath, const struct list *input,
-                         struct list *output)
+int clear_ripng_route_rpc(struct nb_cb_rpc_args *args)
 {
        struct ripng *ripng;
        struct yang_data *yang_vrf;
 
-       yang_vrf = yang_data_list_find(input, "%s/%s", xpath, "input/vrf");
+       yang_vrf = yang_data_list_find(args->input, "%s/%s", args->xpath,
+                                      "input/vrf");
        if (yang_vrf) {
                ripng = ripng_lookup_by_vrf_name(yang_vrf->value);
                if (ripng)