michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: Fixed conn_meta bitflag misalignment

Browse source 
Fixed misalignment of bitflag in ll_conn type causing unintentional
overwrite between unions. Common flag must be present in master/slave
uinons as well. Problem is only present when enabling feature
CONFIG_BT_CTLR_CONN_META, which is default disabled.

Signed-off-by: Morten Priess <mtpr@oticon.com>
This commit is contained in:
Morten Priess 2021-01-06 15:43:25 +01:00 • committed by Anas Nashif
commit 907a8377b3
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
subsys/bluetooth/controller/ll_sw/ull_conn_types.h
View file

@ -67,6 +67,9 @@ struct ll_conn {
#if defined(CONFIG_BT_PERIPHERAL)
struct {
uint8_t fex_valid:1;
#if defined(CONFIG_BT_CTLR_CONN_META)
uint8_t is_must_expire:1;
#endif /* CONFIG_BT_CTLR_CONN_META */
uint8_t latency_cancel:1;
uint8_t sca:3;
uint32_t force;
@ -77,6 +80,9 @@ struct ll_conn {
#if defined(CONFIG_BT_CENTRAL)
struct {
uint8_t fex_valid:1;
#if defined(CONFIG_BT_CTLR_CONN_META)
uint8_t is_must_expire:1;
#endif /* CONFIG_BT_CTLR_CONN_META */
uint8_t terminate_ack:1;
} master;
#endif /* CONFIG_BT_CENTRAL */