Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c06b61f authored by Richie Hsieh's avatar Richie Hsieh Committed by Andre Eisenbach
Browse files

LE: Fix HOGP connection issues caused by incorrect HCI packet flags 



Do not set the automatically-flushable packet flag for LE bound HCI
packets (Packet_Boundary_Flag 0b10).

Reported-by: default avatarRichie Hsieh <richie.hsieh@mediatek.com>
Change-Id: Id71a096acee70582923e652cfef1f4141b721fed
parent 5c07516f

system/stack/l2cap/l2c_utils.c

+26 −15
Original line number Diff line number Diff line
@@ -344,11 +344,20 @@ BT_HDR *l2cu_build_header (tL2C_LCB *p_lcb, UINT16 len, UINT8 cmd, UINT8 id) 
    p = (UINT8 *)(p_buf + 1) + L2CAP_SEND_CMD_OFFSET;



    /* Put in HCI header - handle + pkt boundary */

#if (BLE_INCLUDED == TRUE)

    if (p_lcb->transport == BT_TRANSPORT_LE)

    {

        UINT16_TO_STREAM (p, (p_lcb->handle | (L2CAP_PKT_START_NON_FLUSHABLE << L2CAP_PKT_TYPE_SHIFT)));

    }

    else

#endif

    {

#if (L2CAP_NON_FLUSHABLE_PB_INCLUDED == TRUE)

        UINT16_TO_STREAM (p, p_lcb->handle | l2cb.non_flushable_pbf);

#else

        UINT16_TO_STREAM (p, (p_lcb->handle | (L2CAP_PKT_START << L2CAP_PKT_TYPE_SHIFT)));

#endif

    }



    UINT16_TO_STREAM (p, len + L2CAP_PKT_OVERHEAD + L2CAP_CMD_OVERHEAD);

    UINT16_TO_STREAM (p, len + L2CAP_CMD_OVERHEAD);
@@ -3328,22 +3337,11 @@ void l2cu_set_acl_hci_header (BT_HDR *p_buf, tL2C_CCB *p_ccb) 
    /* Set the pointer to the beginning of the data minus 4 bytes for the packet header */

    p = (UINT8 *)(p_buf + 1) + p_buf->offset - HCI_DATA_PREAMBLE_SIZE;



#if (L2CAP_NON_FLUSHABLE_PB_INCLUDED == TRUE)

    if ( (((p_buf->layer_specific & L2CAP_FLUSHABLE_MASK) == L2CAP_FLUSHABLE_CH_BASED) && (p_ccb->is_flushable))

            || ((p_buf->layer_specific & L2CAP_FLUSHABLE_MASK) == L2CAP_FLUSHABLE_PKT) )

    {

        UINT16_TO_STREAM (p, p_ccb->p_lcb->handle | (L2CAP_PKT_START << L2CAP_PKT_TYPE_SHIFT));

    }

    else

    {

        UINT16_TO_STREAM (p, p_ccb->p_lcb->handle | l2cb.non_flushable_pbf);

    }

#else

    UINT16_TO_STREAM (p, p_ccb->p_lcb->handle | (L2CAP_PKT_START << L2CAP_PKT_TYPE_SHIFT));

#endif

#if (BLE_INCLUDED == TRUE)

    if (p_ccb->p_lcb->transport == BT_TRANSPORT_LE)

    {

        UINT16_TO_STREAM (p, p_ccb->p_lcb->handle | (L2CAP_PKT_START_NON_FLUSHABLE << L2CAP_PKT_TYPE_SHIFT));



        /* The HCI transport will segment the buffers. */

        if (p_buf->len > btu_cb.hcit_ble_acl_data_size)

        {
@@ -3357,6 +3355,19 @@ void l2cu_set_acl_hci_header (BT_HDR *p_buf, tL2C_CCB *p_ccb) 
    else

#endif

    {

#if (L2CAP_NON_FLUSHABLE_PB_INCLUDED == TRUE)

        if ( (((p_buf->layer_specific & L2CAP_FLUSHABLE_MASK) == L2CAP_FLUSHABLE_CH_BASED) && (p_ccb->is_flushable))

                || ((p_buf->layer_specific & L2CAP_FLUSHABLE_MASK) == L2CAP_FLUSHABLE_PKT) )

        {

            UINT16_TO_STREAM (p, p_ccb->p_lcb->handle | (L2CAP_PKT_START << L2CAP_PKT_TYPE_SHIFT));

        }

        else

        {

            UINT16_TO_STREAM (p, p_ccb->p_lcb->handle | l2cb.non_flushable_pbf);

        }

#else

        UINT16_TO_STREAM (p, p_ccb->p_lcb->handle | (L2CAP_PKT_START << L2CAP_PKT_TYPE_SHIFT));

#endif



        /* The HCI transport will segment the buffers. */

        if (p_buf->len > btu_cb.hcit_acl_data_size)