[mynewt-nimble] 01/32: mesh: Fix passing CID to model publication messages

[andk]

This is an automated email from the ASF dual-hosted git repository.

andk pushed a commit to branch new-master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git

commit ad3ff34e98c285c0a063fc91fea58a34ebe04804
Author: Michał Narajowski <michal.narajow...@codecoup.pl>
AuthorDate: Tue Feb 20 11:50:51 2018 +0100

    mesh: Fix passing CID to model publication messages
    
    The vendor variants of the model publication client messages were not
    passing onward the CID, rather passing CID_NVAL which is clearly not
    right.
    
    X-Original-Commit: 398fd57f82a407a343ff04e445aed6de9e990e8e
---
 nimble/host/mesh/src/cfg_cli.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/nimble/host/mesh/src/cfg_cli.c b/nimble/host/mesh/src/cfg_cli.c
index 05c302b..4d1af2e 100644
--- a/nimble/host/mesh/src/cfg_cli.c
+++ b/nimble/host/mesh/src/cfg_cli.c
@@ -1132,8 +1132,7 @@ int bt_mesh_cfg_mod_pub_get_vnd(u16_t net_idx, u16_t 
addr, u16_t elem_addr,
                return -EINVAL;
        }
 
-       return mod_pub_get(net_idx, addr, elem_addr, mod_id, CID_NVAL,
-                          pub, status);
+       return mod_pub_get(net_idx, addr, elem_addr, mod_id, cid, pub, status);
 }
 
 static int mod_pub_set(u16_t net_idx, u16_t addr, u16_t elem_addr,
@@ -1205,8 +1204,7 @@ int bt_mesh_cfg_mod_pub_set_vnd(u16_t net_idx, u16_t 
addr, u16_t elem_addr,
                return -EINVAL;
        }
 
-       return mod_pub_set(net_idx, addr, elem_addr, mod_id, CID_NVAL,
-                          pub, status);
+       return mod_pub_set(net_idx, addr, elem_addr, mod_id, cid, pub, status);
 }
 
 int bt_mesh_cfg_hb_sub_set(u16_t net_idx, u16_t addr,

-- 
To stop receiving notification emails like this one, please contact
a...@apache.org.