From feded4118b89eba5a1629f45cfe623277612e404 Mon Sep 17 00:00:00 2001 From: Chirag Shah Date: Sat, 10 Oct 2020 14:26:48 -0700 Subject: [PATCH] bgpd: rename router bgp callbacks Avoid similar name function as bgp_crate() Signed-off-by: Chirag Shah --- bgpd/bgp_nb.c | 4 ++-- bgpd/bgp_nb.h | 4 ++-- bgpd/bgp_nb_config.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bgpd/bgp_nb.c b/bgpd/bgp_nb.c index b9fff124df..551bdb0c2b 100644 --- a/bgpd/bgp_nb.c +++ b/bgpd/bgp_nb.c @@ -30,8 +30,8 @@ const struct frr_yang_module_info frr_bgp_info = { .xpath = "/frr-routing:routing/control-plane-protocols/control-plane-protocol/frr-bgp:bgp", .cbs = { .cli_show = cli_show_router_bgp, - .create = bgp_create, - .destroy = bgp_destroy, + .create = bgp_router_create, + .destroy = bgp_router_destroy, } }, { diff --git a/bgpd/bgp_nb.h b/bgpd/bgp_nb.h index 097b40d7b7..341666c7ed 100644 --- a/bgpd/bgp_nb.h +++ b/bgpd/bgp_nb.h @@ -26,8 +26,8 @@ extern const struct frr_yang_module_info frr_bgp_info; /* prototypes */ -int bgp_create(struct nb_cb_create_args *args); -int bgp_destroy(struct nb_cb_destroy_args *args); +int bgp_router_create(struct nb_cb_create_args *args); +int bgp_router_destroy(struct nb_cb_destroy_args *args); int bgp_global_local_as_modify(struct nb_cb_modify_args *args); int bgp_global_router_id_modify(struct nb_cb_modify_args *args); int bgp_global_router_id_destroy(struct nb_cb_destroy_args *args); diff --git a/bgpd/bgp_nb_config.c b/bgpd/bgp_nb_config.c index ba7c5714bb..a610ce6c24 100644 --- a/bgpd/bgp_nb_config.c +++ b/bgpd/bgp_nb_config.c @@ -62,7 +62,7 @@ int routing_control_plane_protocols_name_validate( * XPath: * /frr-routing:routing/control-plane-protocols/control-plane-protocol/frr-bgp:bgp */ -int bgp_create(struct nb_cb_create_args *args) +int bgp_router_create(struct nb_cb_create_args *args) { const struct lyd_node *vrf_dnode; struct bgp *bgp; @@ -132,7 +132,7 @@ int bgp_create(struct nb_cb_create_args *args) return NB_OK; } -int bgp_destroy(struct nb_cb_destroy_args *args) +int bgp_router_destroy(struct nb_cb_destroy_args *args) { struct bgp *bgp; -- 2.39.5