From 0d94ad69f628f2f8015c72d3b99df5ae3d82b367 Mon Sep 17 00:00:00 2001 From: Erik Brockhoff Date: Wed, 6 Apr 2022 12:26:28 +0200 Subject: [PATCH] Bluetooth: controller: removing unused functionality Removing llcp_tx_flush() as it turns out it is not needed. Signed-off-by: Erik Brockhoff --- subsys/bluetooth/controller/ll_sw/ull_llcp.c | 5 ----- subsys/bluetooth/controller/ll_sw/ull_llcp_enc.c | 4 ---- subsys/bluetooth/controller/ll_sw/ull_llcp_internal.h | 1 - 3 files changed, 10 deletions(-) diff --git a/subsys/bluetooth/controller/ll_sw/ull_llcp.c b/subsys/bluetooth/controller/ll_sw/ull_llcp.c index 732b202ae6d..d355677d498 100644 --- a/subsys/bluetooth/controller/ll_sw/ull_llcp.c +++ b/subsys/bluetooth/controller/ll_sw/ull_llcp.c @@ -254,11 +254,6 @@ void llcp_tx_resume_data(struct ll_conn *conn, enum llcp_tx_q_pause_data_mask re } } -void llcp_tx_flush(struct ll_conn *conn) -{ - /* TODO(thoh): do something here to flush the TX Q */ -} - /* * LLCP Procedure Creation */ diff --git a/subsys/bluetooth/controller/ll_sw/ull_llcp_enc.c b/subsys/bluetooth/controller/ll_sw/ull_llcp_enc.c index 6f70a0ece1f..8e95523c8b7 100644 --- a/subsys/bluetooth/controller/ll_sw/ull_llcp_enc.c +++ b/subsys/bluetooth/controller/ll_sw/ull_llcp_enc.c @@ -343,7 +343,6 @@ static void lp_enc_st_unencrypted(struct ll_conn *conn, struct proc_ctx *ctx, ui case LP_ENC_EVT_RUN: /* Pause Tx data */ llcp_tx_pause_data(conn, LLCP_TX_QUEUE_PAUSE_DATA_ENCRYPTION); - llcp_tx_flush(conn); lp_enc_send_enc_req(conn, ctx, evt, param); break; default: @@ -478,7 +477,6 @@ static void lp_enc_state_encrypted(struct ll_conn *conn, struct proc_ctx *ctx, u case LP_ENC_EVT_RUN: /* Pause Tx data */ llcp_tx_pause_data(conn, LLCP_TX_QUEUE_PAUSE_DATA_ENCRYPTION); - llcp_tx_flush(conn); lp_enc_send_pause_enc_req(conn, ctx, evt, param); break; default: @@ -911,7 +909,6 @@ static void rp_enc_state_wait_rx_enc_req(struct ll_conn *conn, struct proc_ctx * case RP_ENC_EVT_ENC_REQ: /* Pause Tx data */ llcp_tx_pause_data(conn, LLCP_TX_QUEUE_PAUSE_DATA_ENCRYPTION); - llcp_tx_flush(conn); /* Pause Rx data */ ull_conn_pause_rx_data(conn); @@ -1054,7 +1051,6 @@ static void rp_enc_state_wait_rx_pause_enc_req(struct ll_conn *conn, struct proc case RP_ENC_EVT_PAUSE_ENC_REQ: /* Pause Tx data */ llcp_tx_pause_data(conn, LLCP_TX_QUEUE_PAUSE_DATA_ENCRYPTION); - llcp_tx_flush(conn); /* * Pause Rx data; will be resumed when the encapsulated * Start Procedure is done. diff --git a/subsys/bluetooth/controller/ll_sw/ull_llcp_internal.h b/subsys/bluetooth/controller/ll_sw/ull_llcp_internal.h index deda8d5d8cd..9490710a108 100644 --- a/subsys/bluetooth/controller/ll_sw/ull_llcp_internal.h +++ b/subsys/bluetooth/controller/ll_sw/ull_llcp_internal.h @@ -350,7 +350,6 @@ void llcp_proc_ctx_release(struct proc_ctx *ctx); void llcp_tx_enqueue(struct ll_conn *conn, struct node_tx *tx); void llcp_tx_pause_data(struct ll_conn *conn, enum llcp_tx_q_pause_data_mask pause_mask); void llcp_tx_resume_data(struct ll_conn *conn, enum llcp_tx_q_pause_data_mask resume_mask); -void llcp_tx_flush(struct ll_conn *conn); /* * LLCP Procedure Response Timeout