OpenSDE Packages Database (without history before r20070)
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

49 lines
1.6 KiB

  1. # --- SDE-COPYRIGHT-NOTE-BEGIN ---
  2. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  3. #
  4. # Filename: package/.../bluez-hcidump/0003-Add-check-for-ACL_START_NO_FLUSH.patch
  5. # Copyright (C) 2011 The OpenSDE Project
  6. #
  7. # More information can be found in the files COPYING and README.
  8. #
  9. # This patch file is dual-licensed. It is available under the license the
  10. # patched project is licensed under, as long as it is an OpenSource license
  11. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12. # of the GNU General Public License as published by the Free Software
  13. # Foundation; either version 2 of the License, or (at your option) any later
  14. # version.
  15. # --- SDE-COPYRIGHT-NOTE-END ---
  16. From 3b1e22fbe09ec0e3cbdbf535b652148a19369c1c Mon Sep 17 00:00:00 2001
  17. From: Daniel Orstadius <daniel.orstadius@nokia.com>
  18. Date: Thu, 10 Feb 2011 12:34:01 +0200
  19. Subject: [PATCH 3/6] Add check for ACL_START_NO_FLUSH
  20. In addition to ACL_START, hcidump should check for the flag
  21. ACL_START_NO_FLUSH to indicate the start of a frame.
  22. Using '==' instead of '&' for the comparison since
  23. ACL_START_NO_FLUSH is defined to zero.
  24. The flag was introduced in BlueZ commit
  25. 2430512c983cad8c20252f1df8f297399993ca3d
  26. ---
  27. parser/l2cap.c | 2 +-
  28. 1 files changed, 1 insertions(+), 1 deletions(-)
  29. diff --git a/parser/l2cap.c b/parser/l2cap.c
  30. index 5c5371f..673aed6 100644
  31. --- a/parser/l2cap.c
  32. +++ b/parser/l2cap.c
  33. @@ -934,7 +934,7 @@ void l2cap_dump(int level, struct frame *frm)
  34. l2cap_hdr *hdr;
  35. uint16_t dlen;
  36. - if (frm->flags & ACL_START) {
  37. + if ((frm->flags & ACL_START) || frm->flags == ACL_START_NO_FLUSH) {
  38. hdr = frm->ptr;
  39. dlen = btohs(hdr->len);
  40. --
  41. 1.7.2.3