Skip to content

Commit 0d94ad6

Browse files
erbr-otcarlescufi
authored andcommitted
Bluetooth: controller: removing unused functionality
Removing llcp_tx_flush() as it turns out it is not needed. Signed-off-by: Erik Brockhoff <[email protected]>
1 parent 025b974 commit 0d94ad6

File tree

3 files changed

+0
-10
lines changed

3 files changed

+0
-10
lines changed

subsys/bluetooth/controller/ll_sw/ull_llcp.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -254,11 +254,6 @@ void llcp_tx_resume_data(struct ll_conn *conn, enum llcp_tx_q_pause_data_mask re
254254
}
255255
}
256256

257-
void llcp_tx_flush(struct ll_conn *conn)
258-
{
259-
/* TODO(thoh): do something here to flush the TX Q */
260-
}
261-
262257
/*
263258
* LLCP Procedure Creation
264259
*/

subsys/bluetooth/controller/ll_sw/ull_llcp_enc.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,6 @@ static void lp_enc_st_unencrypted(struct ll_conn *conn, struct proc_ctx *ctx, ui
343343
case LP_ENC_EVT_RUN:
344344
/* Pause Tx data */
345345
llcp_tx_pause_data(conn, LLCP_TX_QUEUE_PAUSE_DATA_ENCRYPTION);
346-
llcp_tx_flush(conn);
347346
lp_enc_send_enc_req(conn, ctx, evt, param);
348347
break;
349348
default:
@@ -478,7 +477,6 @@ static void lp_enc_state_encrypted(struct ll_conn *conn, struct proc_ctx *ctx, u
478477
case LP_ENC_EVT_RUN:
479478
/* Pause Tx data */
480479
llcp_tx_pause_data(conn, LLCP_TX_QUEUE_PAUSE_DATA_ENCRYPTION);
481-
llcp_tx_flush(conn);
482480
lp_enc_send_pause_enc_req(conn, ctx, evt, param);
483481
break;
484482
default:
@@ -911,7 +909,6 @@ static void rp_enc_state_wait_rx_enc_req(struct ll_conn *conn, struct proc_ctx *
911909
case RP_ENC_EVT_ENC_REQ:
912910
/* Pause Tx data */
913911
llcp_tx_pause_data(conn, LLCP_TX_QUEUE_PAUSE_DATA_ENCRYPTION);
914-
llcp_tx_flush(conn);
915912
/* Pause Rx data */
916913
ull_conn_pause_rx_data(conn);
917914

@@ -1054,7 +1051,6 @@ static void rp_enc_state_wait_rx_pause_enc_req(struct ll_conn *conn, struct proc
10541051
case RP_ENC_EVT_PAUSE_ENC_REQ:
10551052
/* Pause Tx data */
10561053
llcp_tx_pause_data(conn, LLCP_TX_QUEUE_PAUSE_DATA_ENCRYPTION);
1057-
llcp_tx_flush(conn);
10581054
/*
10591055
* Pause Rx data; will be resumed when the encapsulated
10601056
* Start Procedure is done.

subsys/bluetooth/controller/ll_sw/ull_llcp_internal.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,6 @@ void llcp_proc_ctx_release(struct proc_ctx *ctx);
350350
void llcp_tx_enqueue(struct ll_conn *conn, struct node_tx *tx);
351351
void llcp_tx_pause_data(struct ll_conn *conn, enum llcp_tx_q_pause_data_mask pause_mask);
352352
void llcp_tx_resume_data(struct ll_conn *conn, enum llcp_tx_q_pause_data_mask resume_mask);
353-
void llcp_tx_flush(struct ll_conn *conn);
354353

355354
/*
356355
* LLCP Procedure Response Timeout

0 commit comments

Comments
 (0)