summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@theqtcompany.com>2016-02-18 10:53:22 +0100
committerChristian Kandeler <christian.kandeler@theqtcompany.com>2016-02-25 08:49:28 +0000
commit5237ff0cb86a713845019ffd98d6066af00f71f7 (patch)
tree877375bddf9ccef4aef6c8cf8a33545067c4091a
parenta4c2d59aa4fc59a56a390a62536c26774a325965 (diff)
Bluetooth LE: Fix bogus warning output.
Change-Id: I9800e80b455c14f0e6086b1d9e21e2b26a385ebe Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
-rw-r--r--src/bluetooth/bluez/hcimanager.cpp9
1 files changed, 5 insertions, 4 deletions
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<AclData *>(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;