This renames mesh_config_srv_init() to cfgmod_server_init() to avoid confusion with mesh_config_..> API and to reflect that the call pertains to configuration server model. --- mesh/cfgmod-server.c | 2 +- mesh/cfgmod.h | 2 +- mesh/node.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mesh/cfgmod-server.c b/mesh/cfgmod-server.c index b256cdd48..71d59fd40 100644 --- a/mesh/cfgmod-server.c +++ b/mesh/cfgmod-server.c @@ -1284,7 +1284,7 @@ static const struct mesh_model_ops ops = { .pub = NULL }; -void mesh_config_srv_init(struct mesh_node *node, uint8_t ele_idx) +void cfgmod_server_init(struct mesh_node *node, uint8_t ele_idx) { l_debug("%2.2x", ele_idx); mesh_model_register(node, ele_idx, CONFIG_SRV_MODEL, &ops, node); diff --git a/mesh/cfgmod.h b/mesh/cfgmod.h index 84fa184e5..da8b5b32b 100644 --- a/mesh/cfgmod.h +++ b/mesh/cfgmod.h @@ -94,4 +94,4 @@ #define OP_VEND_MODEL_APP_GET 0x804C #define OP_VEND_MODEL_APP_LIST 0x804E -void mesh_config_srv_init(struct mesh_node *node, uint8_t ele_idx); +void cfgmod_server_init(struct mesh_node *node, uint8_t ele_idx); diff --git a/mesh/node.c b/mesh/node.c index 0f4569e36..0e95d908b 100644 --- a/mesh/node.c +++ b/mesh/node.c @@ -476,7 +476,7 @@ static bool init_from_storage(struct mesh_config_node *db_node, goto fail; /* Initialize configuration server model */ - mesh_config_srv_init(node, PRIMARY_ELE_IDX); + cfgmod_server_init(node, PRIMARY_ELE_IDX); node->cfg = cfg; @@ -1509,7 +1509,7 @@ static bool add_local_node(struct mesh_node *node, uint16_t unicast, bool kr, mesh_config_save(node->cfg, true, NULL, NULL); /* Initialize configuration server model */ - mesh_config_srv_init(node, PRIMARY_ELE_IDX); + cfgmod_server_init(node, PRIMARY_ELE_IDX); return true; } -- 2.21.0