michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Classic: L2CAP: Support zero-length SDU in none basic mode

Browse source 
Support zero-length SDU sending if the L2CAP channel connection is not
in basic mode.

Flag the zero-length SDU buffer and clear it if it has been processed.

Signed-off-by: Lyle Zhu <lyle.zhu@nxp.com>
This commit is contained in:
Lyle Zhu 2025-04-28 20:00:21 +08:00 • committed by Benjamin Cabé
commit 63dbc4c7f9
1 changed files with 18 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

18
subsys/bluetooth/host/classic/l2cap_br.c
View file

@ -60,6 +60,11 @@ LOG_MODULE_REGISTER(bt_l2cap_br, CONFIG_BT_L2CAP_LOG_LEVEL);
#define L2CAP_BR_PSM_SDP 0x0001 #define L2CAP_BR_PSM_SDP 0x0001
#define L2CAP_BR_ZL_I_FRAME_FLAG_MASK 0xfffffeffU
#define L2CAP_BR_ZL_I_FRAME_UD_FLAG 0xfffffeff
#define L2CAP_BR_IS_ZERO_LEN_I_FRAME(flag) \
((POINTER_TO_UINT(flag) & L2CAP_BR_ZL_I_FRAME_FLAG_MASK) == L2CAP_BR_ZL_I_FRAME_UD_FLAG)
#define L2CAP_BR_S_FRAME_FLAG_MASK 0xffffff00U #define L2CAP_BR_S_FRAME_FLAG_MASK 0xffffff00U
#define L2CAP_BR_S_FRAME_UD_FLAG 0xffffff00 #define L2CAP_BR_S_FRAME_UD_FLAG 0xffffff00
#define L2CAP_BR_IS_S_FRAME(flag) \ #define L2CAP_BR_IS_S_FRAME(flag) \
@ -892,6 +897,11 @@ int bt_l2cap_br_send_cb(struct bt_conn *conn, uint16_t cid, struct net_buf *buf,
hdr = net_buf_push(buf, sizeof(*hdr)); hdr = net_buf_push(buf, sizeof(*hdr));
hdr->len = sys_cpu_to_le16(buf->len - sizeof(*hdr)); hdr->len = sys_cpu_to_le16(buf->len - sizeof(*hdr));
hdr->cid = sys_cpu_to_le16(cid); hdr->cid = sys_cpu_to_le16(cid);
} else {
if ((cb == NULL) && (user_data == NULL) && (buf->len == 0)) {
/* Mask it is a zero-length I-frame */
user_data = UINT_TO_POINTER(L2CAP_BR_ZL_I_FRAME_UD_FLAG);
}
} }
#else #else
hdr = net_buf_push(buf, sizeof(*hdr)); hdr = net_buf_push(buf, sizeof(*hdr));
@ -1139,6 +1149,10 @@ static struct net_buf *l2cap_br_get_next_sdu(struct bt_l2cap_br_chan *br_chan)
if (L2CAP_BR_IS_S_FRAME(closure_data(sdu->user_data))) { if (L2CAP_BR_IS_S_FRAME(closure_data(sdu->user_data))) {
return sdu; return sdu;
} }
if (L2CAP_BR_IS_ZERO_LEN_I_FRAME(closure_data(sdu->user_data))) {
return sdu;
}
} }
return NULL; return NULL;
@ -1501,6 +1515,10 @@ send_i_frame:
br_chan->next_tx_seq = br_chan->next_tx_seq =
bt_l2cap_br_update_seq(br_chan, br_chan->next_tx_seq + 1); bt_l2cap_br_update_seq(br_chan, br_chan->next_tx_seq + 1);
if (L2CAP_BR_IS_ZERO_LEN_I_FRAME(closure_data(pdu->user_data))) {
make_closure(pdu->user_data, NULL, NULL);
}
net_buf_pull(pdu, pdu_len); net_buf_pull(pdu, pdu_len);
if (br_chan->rx.mode != BT_L2CAP_BR_LINK_MODE_STREAM) { if (br_chan->rx.mode != BT_L2CAP_BR_LINK_MODE_STREAM) {