Commit 2579690b authored by Vinayak Kariappa Chettimada's avatar Vinayak Kariappa Chettimada Committed by Carles Cufi
Browse files

Bluetooth: Controller: Fix connection update window offset data type 



Fix regression in refactored LLCP using uint16_t instead of
uint32_t in storing the win_offset_us value. This caused
connection update to fail with incorrect window offset being
used to schedule the connection radio events.

Regression since commit e1c2c36f ("Bluetooth: controller:
llcp: set refactored as default").

Signed-off-by: default avatarVinayak Kariappa Chettimada <vich@nordicsemi.no>
parent a86ad87d

subsys/bluetooth/controller/ll_sw/ull_conn.c

+1 −1
Original line number Diff line number Diff line
@@ -2088,7 +2088,7 @@ static void ull_conn_update_ticker(struct ll_conn *conn, 
}



void ull_conn_update_parameters(struct ll_conn *conn, uint8_t is_cu_proc, uint8_t win_size,

				uint16_t win_offset_us, uint16_t interval, uint16_t latency,

				uint32_t win_offset_us, uint16_t interval, uint16_t latency,

				uint16_t timeout, uint16_t instant)

{

	struct lll_conn *lll;

subsys/bluetooth/controller/ll_sw/ull_conn_internal.h

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ static inline void cpr_active_reset(void) 
uint16_t ull_conn_event_counter(struct ll_conn *conn);



void ull_conn_update_parameters(struct ll_conn *conn, uint8_t is_cu_proc,

				uint8_t win_size, uint16_t win_offset_us,

				uint8_t win_size, uint32_t win_offset_us,

				uint16_t interval, uint16_t latency,

				uint16_t timeout, uint16_t instant);

subsys/bluetooth/controller/ll_sw/ull_llcp_internal.h

+2 −2
Original line number Diff line number Diff line
@@ -209,13 +209,13 @@ struct proc_ctx { 
			uint8_t error;

			uint8_t rejected_opcode;

			uint8_t params_changed;

			uint16_t instant;

			uint8_t win_size;

			uint16_t win_offset_us;

			uint16_t instant;

			uint16_t interval_min;

			uint16_t interval_max;

			uint16_t latency;

			uint16_t timeout;

			uint32_t win_offset_us;

#if defined(CONFIG_BT_CTLR_CONN_PARAM_REQ)

			uint8_t  preferred_periodicity;

			uint16_t reference_conn_event_count;

CRA Git | Maintained and supported by SUSTech CRA and CCSE