From 5237ff0cb86a713845019ffd98d6066af00f71f7 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 18 Feb 2016 10:53:22 +0100 Subject: Bluetooth LE: Fix bogus warning output. Change-Id: I9800e80b455c14f0e6086b1d9e21e2b26a385ebe Reviewed-by: Alex Blasche --- src/bluetooth/bluez/hcimanager.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/bluetooth/bluez') diff --git a/src/bluetooth/bluez/hcimanager.cpp b/src/bluetooth/bluez/hcimanager.cpp index dfb99d5a..93bf941b 100644 --- a/src/bluetooth/bluez/hcimanager.cpp +++ b/src/bluetooth/bluez/hcimanager.cpp @@ -477,6 +477,11 @@ void HciManager::handleHciAclPacket(const quint8 *data, int size) const AclData *aclData = reinterpret_cast(rawAclData); data += sizeof *aclData; size -= sizeof *aclData; + + // Consider only directed, complete messages. + if ((aclData->pbFlag != 0 && aclData->pbFlag != 2) || aclData->bcFlag != 0) + return; + if (size < aclData->dataLen) { qCWarning(QT_BT_BLUEZ) << "HCI ACL packet data size" << size << "is smaller than specified size" << aclData->dataLen; @@ -486,10 +491,6 @@ void HciManager::handleHciAclPacket(const quint8 *data, int size) // qCDebug(QT_BT_BLUEZ) << "handle:" << aclData->handle << "PB:" << aclData->pbFlag // << "BC:" << aclData->bcFlag << "data len:" << aclData->dataLen; - // Consider only directed, complete messages. - if ((aclData->pbFlag != 0 && aclData->pbFlag != 2) || aclData->bcFlag != 0) - return; - if (size < int(sizeof(L2CapHeader))) { qCWarning(QT_BT_BLUEZ) << "Unexpected HCI ACL packet size"; return; -- cgit v1.2.3