Skip to content

Commit

Permalink
Merge branch 'bugfix/use_bt_sdp_bqb_include_macro_for_ertm_mode_flag_…
Browse files Browse the repository at this point in the history
…v5.1' into 'release/v5.1'

fix(bt/bluedroid): Add correct macro for ertm mode included flag (backport v5.1)

See merge request espressif/esp-idf!26455
  • Loading branch information
jack0c committed Oct 18, 2023
2 parents e450ee2 + d623934 commit fb2076c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions components/bt/host/bluedroid/stack/l2cap/l2c_utils.c
Original file line number Diff line number Diff line change
Expand Up @@ -1563,12 +1563,12 @@ tL2C_CCB *l2cu_allocate_ccb (tL2C_LCB *p_lcb, UINT16 cid)
l2c_fcr_free_timer (p_ccb);
#endif ///CLASSIC_BT_INCLUDED == TRUE

#if BT_CLASSIC_BQB_INCLUDED
#if BT_SDP_BQB_INCLUDED
if (l2cap_bqb_ertm_mode_included_flag) {
p_ccb->ertm_info.preferred_mode = L2CAP_FCR_ERTM_MODE;
p_ccb->ertm_info.allowed_modes = L2CAP_FCR_CHAN_OPT_ERTM;
} else
#endif /* BT_CLASSIC_BQB_INCLUDED */
#endif /* BT_SDP_BQB_INCLUDED */
{
p_ccb->ertm_info.preferred_mode = L2CAP_FCR_BASIC_MODE; /* Default mode for channel is basic mode */
p_ccb->ertm_info.allowed_modes = L2CAP_FCR_CHAN_OPT_BASIC|L2CAP_FCR_CHAN_OPT_ERTM;
Expand Down

0 comments on commit fb2076c

Please sign in to comment.