From d9c67ebd7777da9f32fb63f4cd88eb63e4f0ef98 Mon Sep 17 00:00:00 2001 From: Vinayak Kariappa Chettimada Date: Fri, 17 Jan 2020 18:09:27 +0530 Subject: [PATCH] Bluetooth: controller: split: Revert Move invalidation of connection handle This reverts commit d3e3f8d2b48768de2d3e539e33ff2b7077f0496a. Signed-off-by: Vinayak Kariappa Chettimada --- subsys/bluetooth/controller/ll_sw/ull_conn.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/subsys/bluetooth/controller/ll_sw/ull_conn.c b/subsys/bluetooth/controller/ll_sw/ull_conn.c index d2ad79a85e9..4b64600825b 100644 --- a/subsys/bluetooth/controller/ll_sw/ull_conn.c +++ b/subsys/bluetooth/controller/ll_sw/ull_conn.c @@ -1714,6 +1714,9 @@ static void conn_cleanup(struct ll_conn *conn, u8_t reason) LL_ASSERT((ticker_status == TICKER_STATUS_SUCCESS) || (ticker_status == TICKER_STATUS_BUSY)); + /* Invalidate the connection context */ + lll->handle = 0xFFFF; + /* Demux and flush Tx PDUs that remain enqueued in thread context */ ull_conn_tx_demux(UINT8_MAX); } @@ -1743,9 +1746,6 @@ static void tx_lll_flush(void *param) lll_conn_flush(lll); - /* Invalidate the connection context */ - lll->handle = 0xFFFF; - link = memq_dequeue(lll->memq_tx.tail, &lll->memq_tx.head, (void **)&tx); while (link) {