Check for HCI_CHANNEL_MONITOR for Linux Bluetooth Monitor support.

Support the Linux Bluetooth Monitor mechanism if:

	we support Linux Bluetooth;

	struct sockaddr_hci includes an hci_channel field;

	HCI_CHANNEL_MONITOR is defined by the Bluetooth headers;

as there are some 3.x kernel versions in which struct sockaddr_hci
includes an hci_channel field but in which HCI_CHANNEL_MONITOR is not
defined.

1 files changed, 4 insertions, 5 deletions

diff --git a/pcap.c b/pcap.c
index 9010d34c..f8292895 100644
--- a/pcap.c
+++ b/pcap.c
@@ -86,13 +86,12 @@
 
 #ifdef PCAP_SUPPORT_BT
 #include "pcap-bt-linux.h"
+#endif
 
-#ifdef SOCKADDR_HCI_HAS_HCI_CHANNEL
+#ifdef PCAP_SUPPORT_BT_MONITOR
 #include "pcap-bt-monitor-linux.h"
 #endif
 
-#endif /* PCAP_SUPPORT_BT */
-
 #ifdef PCAP_SUPPORT_CAN
 #include "pcap-can-linux.h"
 #endif
@@ -323,10 +322,10 @@ struct capture_source_type {
 #endif
 #ifdef PCAP_SUPPORT_BT
 	{ bt_findalldevs, bt_create },
-#ifdef SOCKADDR_HCI_HAS_HCI_CHANNEL
+#endif
+#ifdef PCAP_SUPPORT_BT_MONITOR
 	{ bt_monitor_findalldevs, bt_monitor_create },
 #endif
-#endif /* PCAP_SUPPORT_BT */
 #if PCAP_SUPPORT_CANUSB
 	{ canusb_findalldevs, canusb_create },
 #endif