Merge "Allow L2CAP first packet with partial header" am: 1fc5965ebd am: 47d7bac72f (8637c07e) · Commits · e / os / android_packages_modules_Bluetooth

system/hci/src/packet_fragmenter.cc

+5 −3

Original line number	Diff line number	Diff line
		@@ -39,7 +39,9 @@
		#define HANDLE_MASK 0x0FFF
		#define START_PACKET_BOUNDARY 2
		#define CONTINUATION_PACKET_BOUNDARY 1
		#define L2CAP_HEADER_SIZE 4
		#define L2CAP_HEADER_PDU_LEN_SIZE 2
		#define L2CAP_HEADER_CID_SIZE 2
		#define L2CAP_HEADER_SIZE (L2CAP_HEADER_PDU_LEN_SIZE + L2CAP_HEADER_CID_SIZE)

		// Our interface and callbacks

		@@ -146,9 +148,9 @@ static void reassemble_and_dispatch(UNUSED_ATTR BT_HDR* packet) {
		buffer_allocator->free(hdl);
		}

		if (acl_length < L2CAP_HEADER_SIZE) {
		if (acl_length < L2CAP_HEADER_PDU_LEN_SIZE) {
		LOG_WARN(LOG_TAG, "%s L2CAP packet too small (%d < %d). Dropping it.",
		__func__, packet->len, L2CAP_HEADER_SIZE);
		__func__, packet->len, L2CAP_HEADER_PDU_LEN_SIZE);
		buffer_allocator->free(packet);
		return;
		}