Skip to content

[nrf fromtree] Bluetooth: Mesh: make corresponding group ID unique #2715

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 8, 2025
Merged

[nrf fromtree] Bluetooth: Mesh: make corresponding group ID unique #2715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions subsys/bluetooth/mesh/access.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1830,8 +1830,8 @@ int bt_mesh_model_correspond(const struct bt_mesh_model *corresponding_mod,

MOD_REL_LIST_FOR_EACH(i) {
if (mod_rel_list[i].type < RELATION_TYPE_EXT &&
mod_rel_list[i].type > cor_id) {
cor_id = mod_rel_list[i].type;
mod_rel_list[i].type >= cor_id) {
cor_id = mod_rel_list[i].type + 1;
}

if ((IS_MOD_BASE(base_mod, i, base_offset) ||
Expand Down
4 changes: 2 additions & 2 deletions tests/bsim/bluetooth/mesh/src/test_cdp1.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ static const struct bt_mesh_comp_p1_model_item test_p1_mod2 = {
.cor_present = 1,
.format = 0,
.ext_item_cnt = 1,
.cor_id = 0,
.cor_id = 1,
};

static const struct bt_mesh_comp_p1_model_item test_p1_mod3 = {
Expand All @@ -211,7 +211,7 @@ static const struct bt_mesh_comp_p1_model_item test_p1_mod4 = {
.cor_present = 1,
.format = 0,
.ext_item_cnt = 0,
.cor_id = 0,
.cor_id = 1,
};

static const struct bt_mesh_comp_p1_model_item test_p1_mod5 = {
Expand Down