michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Mesh: LPN: Fix clearing pending request

Browse source 
The code would unconditionally clear sent_req in update_timeout(),
which would e.g. cause us to switch to Friend Polls if the Friend
didn't respond to a Subscription List Add/Remove on the first attempt.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Johan Hedberg 2017-11-23 11:29:33 +02:00 • committed by Johan Hedberg
commit 9859146722
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
subsys/bluetooth/host/mesh/lpn.c
View file

@ -310,8 +310,8 @@ static void req_sent(u16_t duration, int err, void *user_data)
struct bt_mesh_lpn *lpn = &bt_mesh.lpn;
#if defined(CONFIG_BT_MESH_DEBUG_LOW_POWER)
BT_DBG("duration %u err %d state %s",
duration, err, state2str(lpn->state));
BT_DBG("req 0x%02x duration %u err %d state %s",
lpn->sent_req, duration, err, state2str(lpn->state));
#endif
if (err) {
@ -652,6 +652,8 @@ static bool sub_update(u8_t op)
struct bt_mesh_ctl_friend_sub req;
size_t i, g;
BT_DBG("op 0x%02x sent_req 0x%02x", op, lpn->sent_req);
if (lpn->sent_req) {
return false;
}
@ -704,8 +706,6 @@ static bool sub_update(u8_t op)
static void update_timeout(struct bt_mesh_lpn *lpn)
{
lpn->sent_req = 0;
if (lpn->established) {
BT_WARN("No response from Friend during ReceiveWindow");
bt_mesh_scan_disable();
@ -718,6 +718,7 @@ static void update_timeout(struct bt_mesh_lpn *lpn)
if (lpn->req_attempts < 6) {
BT_WARN("Retrying first Friend Poll");
lpn->sent_req = 0;
if (send_friend_poll() == 0) {
return;
}