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

Commit 9982d014 authored by Andre Eisenbach's avatar Andre Eisenbach Committed by Android Partner Code Review
Browse files

Merge "Simultanious LE Central/Peripheral operation not possible" into m-wireless-dev

parents 5a20c99e 2dcedf7b

system/stack/l2cap/l2c_link.c

+11 −7
Original line number Diff line number Diff line
@@ -1139,15 +1139,19 @@ void l2c_link_check_send_pkts (tL2C_LCB *p_lcb, tL2C_CCB *p_ccb, BT_HDR *p_buf) 
        for (xx = 0; xx < MAX_L2CAP_LINKS; xx++, p_lcb++)

        {

            /* If controller window is full, nothing to do */

            if ( (l2cb.controller_xmit_window == 0

#if (BLE_INCLUDED == TRUE)

                  && (p_lcb->transport == BT_TRANSPORT_BR_EDR)

#endif

                )

#if (BLE_INCLUDED == TRUE)

                || (p_lcb->transport == BT_TRANSPORT_LE && l2cb.controller_le_xmit_window == 0 )

#endif

              if ( (l2cb.controller_xmit_window == 0 

                && (p_lcb->transport == BT_TRANSPORT_BR_EDR))

                || (p_lcb->transport == BT_TRANSPORT_LE 

                  && l2cb.controller_le_xmit_window == 0 )

                || (l2cb.round_robin_unacked >= l2cb.round_robin_quota

                  && (p_lcb->transport == BT_TRANSPORT_BR_EDR))

                || ((p_lcb->transport == BT_TRANSPORT_LE) 

                  && (l2cb.ble_round_robin_unacked >= l2cb.ble_round_robin_quota)))

#else 

            if ((l2cb.controller_xmit_window == 0) 

              || (l2cb.round_robin_unacked >= l2cb.round_robin_quota))

#endif

                break;



            /* Check for wraparound */