[mynewt-nimble] branch master updated: nimble/ll: Fix regression in chained scan response

[ja...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new f6cd9bb  nimble/ll: Fix regression in chained scan response
f6cd9bb is described below

commit f6cd9bb414f2fb1170fe022e50762f94cb604265
Author: Łukasz Rymanowski <lu...@codecoup.pl>
AuthorDate: Wed Jun 19 11:39:56 2019 +0200

    nimble/ll: Fix regression in chained scan response
    
    Regression after
    7c17723d nimble/ll: Simplify aux_data ref counter usage
    
    Setting BLE_LL_AUX_INCOMPLETE_BIT has been incorrectly moved in mentioned
    patch.
    
    This fixes LL/DDI/SCN/BV-24-C
---
 nimble/controller/src/ble_ll_scan.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nimble/controller/src/ble_ll_scan.c b/nimble/controller/src/ble_ll_scan.c
index c30e6b5..7dfd3a2 100644
--- a/nimble/controller/src/ble_ll_scan.c
+++ b/nimble/controller/src/ble_ll_scan.c
@@ -1944,12 +1944,12 @@ ble_ll_scan_get_aux_data(struct ble_mbuf_hdr *ble_hdr, uint8_t *rxbuf)
             }
 
             BLE_LL_AUX_SET_FLAG(new_aux, BLE_LL_AUX_CHAIN_BIT);
+            BLE_LL_AUX_SET_FLAG(new_aux, BLE_LL_AUX_INCOMPLETE_BIT);
         } else {
             if (ble_ll_scan_ext_adv_init(&new_aux) < 0) {
             /* Out of memory */
             return -1;
             }
-            BLE_LL_AUX_SET_FLAG(new_aux, BLE_LL_AUX_INCOMPLETE_BIT);
         }
 
         new_aux->aux_phy = tmp_aux_data.aux_phy;