From 9bd562adc7a8c2331e8a5439f81b6ef190288a8f Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Fri, 9 Nov 2012 21:01:06 +0100
Subject: [PATCH] monitor: Move L2CAP header definition into global include

---
 monitor/bt.h    | 5 +++++
 monitor/l2cap.c | 1 +
 monitor/l2cap.h | 5 -----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/monitor/bt.h b/monitor/bt.h
index fcd79d7cd..6e37b99b4 100644
--- a/monitor/bt.h
+++ b/monitor/bt.h
@@ -1293,3 +1293,8 @@ struct bt_hci_evt_le_long_term_key_request {
 #define BT_HCI_ERR_HARDWARE_FAILURE		0x03
 #define BT_HCI_ERR_PAGE_TIMEOUT			0x04
 #define BT_HCI_ERR_INVALID_PARAMETERS		0x12
+
+struct bt_l2cap_hdr {
+	uint16_t len;
+	uint16_t cid;
+} __attribute__ ((packed));
diff --git a/monitor/l2cap.c b/monitor/l2cap.c
index ecdd73ccd..70667ce72 100644
--- a/monitor/l2cap.c
+++ b/monitor/l2cap.c
@@ -28,6 +28,7 @@
 
 #include <bluetooth/bluetooth.h>
 
+#include "bt.h"
 #include "packet.h"
 #include "display.h"
 #include "l2cap.h"
diff --git a/monitor/l2cap.h b/monitor/l2cap.h
index 62143646b..ca5d777f1 100644
--- a/monitor/l2cap.h
+++ b/monitor/l2cap.h
@@ -24,9 +24,4 @@
 
 #include <stdint.h>
 
-struct bt_l2cap_hdr {
-	uint16_t len;
-	uint16_t cid;
-} __attribute__ ((packed));
-
 void l2cap_packet(uint16_t handle, const void *data, uint16_t size);
-- 
2.47.3