[PATCH] Add check for ACL_START_NO_FLUSH

[PATCH] Add check for ACL_START_NO_FLUSH

[Daniel Örstadius]

[-- Attachment #1: Type: text/plain, Size: 1 bytes --]



[-- Attachment #2: 0001-Add-check-for-ACL_START_NO_FLUSH.patch --]
[-- Type: text/x-patch, Size: 968 bytes --]

From 19bbd9d8236a643ec0674452b143dc451531a862 Mon Sep 17 00:00:00 2001
From: Daniel Orstadius <daniel.orstadius@nokia.com>
Date: Thu, 10 Feb 2011 12:34:01 +0200
Subject: [PATCH] Add check for ACL_START_NO_FLUSH

In addition to ACL_START, hcidump should check for the flag
ACL_START_NO_FLUSH to indicate the start of a frame.

Using '==' instead of '&' for the comparison since
ACL_START_NO_FLUSH is defined to zero.

The flag was introduced in BlueZ commit
2430512c983cad8c20252f1df8f297399993ca3d
---
 parser/l2cap.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/parser/l2cap.c b/parser/l2cap.c
index 963468c..e25ce7f 100644
--- a/parser/l2cap.c
+++ b/parser/l2cap.c
@@ -941,7 +941,8 @@ void l2cap_dump(int level, struct frame *frm)
 	l2cap_hdr *hdr;
 	uint16_t dlen;
 
-	if (frm->flags & ACL_START) {
+	if (frm->flags & ACL_START ||
+	    frm->flags == ACL_START_NO_FLUSH) {
 		hdr  = frm->ptr;
 		dlen = btohs(hdr->len);
 
-- 
1.6.0.4

Re: [PATCH] Add check for ACL_START_NO_FLUSH

[Johan Hedberg]

Hi Daniel,

On Thu, Feb 10, 2011, Daniel ??rstadius wrote:
> In addition to ACL_START, hcidump should check for the flag
> ACL_START_NO_FLUSH to indicate the start of a frame.
> 
> Using '==' instead of '&' for the comparison since
> ACL_START_NO_FLUSH is defined to zero.
> 
> The flag was introduced in BlueZ commit
> 2430512c983cad8c20252f1df8f297399993ca3d
> ---
>  parser/l2cap.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)

Pushed upstream after obvious coding-style fixes. Please pay attention
to those.

Johan