From 3c412221cc90ba2f43e5f8a0e4684fbfd7599866 Mon Sep 17 00:00:00 2001 From: Matthias Ringwald Date: Tue, 25 Jul 2017 13:24:37 +0200 Subject: [PATCH] l2cap-ertm: fix l2cap data dispatch for ertm --- src/l2cap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/l2cap.c b/src/l2cap.c index fc2732acf..b846a7c65 100644 --- a/src/l2cap.c +++ b/src/l2cap.c @@ -2925,7 +2925,7 @@ static void l2cap_acl_handler(uint8_t packet_type, uint16_t channel, uint8_t *pa l2cap_channel->req_seq = l2cap_channel->expected_tx_seq; // process SDU - l2cap_ertm_handle_in_sequence_sdu(l2cap_channel, sar, &packet[COMPLETE_L2CAP_HEADER+2], size-(COMPLETE_L2CAP_HEADER+2)); + l2cap_ertm_handle_in_sequence_sdu(l2cap_channel, sar, &packet[COMPLETE_L2CAP_HEADER+2], size-(COMPLETE_L2CAP_HEADER+2+2)); // process stored segments while (1){ @@ -2955,7 +2955,7 @@ static void l2cap_acl_handler(uint8_t packet_type, uint16_t channel, uint8_t *pa int delta = (tx_seq - l2cap_channel->expected_tx_seq) & 0x3f; if (delta < 2){ // store segment - l2cap_ertm_handle_out_of_sequence_sdu(l2cap_channel, sar, delta, &packet[COMPLETE_L2CAP_HEADER+2], size-(COMPLETE_L2CAP_HEADER+2)); + l2cap_ertm_handle_out_of_sequence_sdu(l2cap_channel, sar, delta, &packet[COMPLETE_L2CAP_HEADER+2], size-(COMPLETE_L2CAP_HEADER+2+2)); log_info("Received unexpected frame TxSeq %u but expected %u -> send S-SREJ", tx_seq, l2cap_channel->expected_tx_seq); l2cap_channel->send_supervisor_frame_selective_reject = 1;