michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: Fix to restrict addr set in initiator

Browse source 
Fix controller implementation to restrict HCI LE Set Random
Address command when advertising and/or active scanning
and/or initiator state is enable.

Fixes LL.TS.5.0.2 conformance tests:
LL/CON/INI/BV-01-C [Connection Initiation]
LL/SEC/ADV/BV-01-C [Advertising With Static Address]
LL/SEC/SCN/BV-01-C [Random Address Scanning]

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2018-01-31 08:49:13 +01:00 • committed by Johan Hedberg
commit 9acfc7fb5c
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
subsys/bluetooth/controller/ll_sw/ctrl.c
View file

@ -10250,8 +10250,10 @@ u32_t radio_scan_is_enabled(void)
{ {
/* NOTE: BIT(0) - passive scanning enabled /* NOTE: BIT(0) - passive scanning enabled
* BIT(1) - active scanning enabled * BIT(1) - active scanning enabled
* BIT(2) - initiator enabled
*/ */
return (u32_t)_radio.scanner.is_enabled << _radio.scanner.type; return ((u32_t)_radio.scanner.is_enabled << _radio.scanner.type) |
(_radio.scanner.conn ? BIT(2) : 0);
} }
u32_t radio_scan_filter_pol_get(void) u32_t radio_scan_filter_pol_get(void)

2
subsys/bluetooth/controller/ll_sw/ll_addr.c
View file

@ -43,7 +43,7 @@ u8_t *ll_addr_get(u8_t addr_type, u8_t *bdaddr)
u32_t ll_addr_set(u8_t addr_type, u8_t const *const bdaddr) u32_t ll_addr_set(u8_t addr_type, u8_t const *const bdaddr)
{ {
if (radio_adv_is_enabled() || if (radio_adv_is_enabled() ||
(radio_scan_is_enabled() & BIT(1))) { (radio_scan_is_enabled() & (BIT(1) | BIT(2)))) {
return BT_HCI_ERR_CMD_DISALLOWED; return BT_HCI_ERR_CMD_DISALLOWED;
} }