Merge pull request apache#78 from sjanc/priv_build

sjanc · web-flow · commit 3f8b139b4c37 · 2018-05-04T14:42:39.000+02:00
nimble/ll: Fix build with privacy disabled
diff --git a/nimble/controller/src/ble_ll_conn.c b/nimble/controller/src/ble_ll_conn.c
@@ -1742,11 +1742,13 @@ ble_ll_conn_master_init(struct ble_ll_conn_sm *connsm,
          * and we need to adjust here. If device is on resolve list mark type as
          * 'identity' as this means also RPA is allowed for connection.
          */
+#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY) == 1)
         if ((connsm->peer_addr_type < BLE_HCI_CONN_PEER_ADDR_PUBLIC_IDENT) &&
                 ble_ll_resolv_list_find(connsm->peer_addr,
                                         connsm->peer_addr_type)) {
             connsm->peer_addr_type += 2;
         }
+#endif
 
     }
 
@@ -1858,10 +1860,12 @@ ble_ll_conn_ext_master_init(struct ble_ll_conn_sm *connsm,
          * mark type as 'identity' as this means also RPA is allowed for
          * connection.
          */
+#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY) == 1)
         if (ble_ll_resolv_list_find(connsm->peer_addr,
                                     connsm->peer_addr_type)) {
             connsm->peer_addr_type += 2;
         }
+#endif
     }
 
     connsm->initial_params = *hcc;

Original file line number	Diff line number	Diff line change
`@@ -1742,11 +1742,13 @@ ble_ll_conn_master_init(struct ble_ll_conn_sm *connsm,`
`1742`	`1742`	`* and we need to adjust here. If device is on resolve list mark type as`
`1743`	`1743`	`* 'identity' as this means also RPA is allowed for connection.`
`1744`	`1744`	`*/`
	`1745`	`+#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY) == 1)`
`1745`	`1746`	`if ((connsm->peer_addr_type < BLE_HCI_CONN_PEER_ADDR_PUBLIC_IDENT) &&`
`1746`	`1747`	`ble_ll_resolv_list_find(connsm->peer_addr,`
`1747`	`1748`	`connsm->peer_addr_type)) {`
`1748`	`1749`	`connsm->peer_addr_type += 2;`
`1749`	`1750`	`}`
	`1751`	`+#endif`
`1750`	`1752`
`1751`	`1753`	`}`
`1752`	`1754`
`@@ -1858,10 +1860,12 @@ ble_ll_conn_ext_master_init(struct ble_ll_conn_sm *connsm,`
`1858`	`1860`	`* mark type as 'identity' as this means also RPA is allowed for`
`1859`	`1861`	`* connection.`
`1860`	`1862`	`*/`
	`1863`	`+#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY) == 1)`
`1861`	`1864`	`if (ble_ll_resolv_list_find(connsm->peer_addr,`
`1862`	`1865`	`connsm->peer_addr_type)) {`
`1863`	`1866`	`connsm->peer_addr_type += 2;`
`1864`	`1867`	`}`
	`1868`	`+#endif`
`1865`	`1869`	`}`
`1866`	`1870`
`1867`	`1871`	`connsm->initial_params = *hcc;`