bluetooth definition redundancy fix
PATCH 1/1 bluetooth definition redundancy fix
Hi,
HCI Core debug context is redefined 4 times in mm1 bluetooth
module.Here's a trivial patch to have it in hci_core.h (only).
Regards,
FabF
include/net/bluetooth/hci_core.h +6 -0
@@ -32,6 +32,12 @@#include <linux/proc_fs.h> #include <net/bluetooth/hci.h> +#ifndef CONFIG_BT_HCI_CORE_DEBUG +#undef BT_DBG +#define BT_DBG( A... ) +#endif + +/* HCI upper protocols */ #define HCI_PROTO_L2CAP 0#define HCI_PROTO_SCO 1
net/bluetooth/hci_conn.c +0 -5
@@ -52,11 +52,6 @@#include <net/bluetooth/bluetooth.h> #include <net/bluetooth/hci_core.h> -#ifndef CONFIG_BT_HCI_CORE_DEBUG -#undef BT_DBG -#define BT_DBG( A... ) -#endif -void hci_acl_connect (struct hci_conn *conn) {struct hci_dev *hdev = conn->hdev;
net/bluetooth/hci_core.c +0 -5
@@ -53,11 +53,6 @@#include <net/bluetooth/bluetooth.h> #include <net/bluetooth/hci_core.h> -#ifndef CONFIG_BT_HCI_CORE_DEBUG -#undef BT_DBG -#define BT_DBG( A... ) -#endif -static void hci_cmd_task (unsigned long arg);static void hci_rx_task (unsigned long arg);static void hci_tx_task (unsigned long arg);
net/bluetooth/hci_sock.c +0 -5
@@ -54,11 +54,6 @@#include <net/bluetooth/bluetooth.h> #include <net/bluetooth/hci_core.h> -#ifndef CONFIG_BT_HCI_SOCK_DEBUG -#undef BT_DBG -#define BT_DBG( A... ) -#endif -/* ----- HCI socket interface ----- */ static inline int hci_test_bit (int nr,void *addr)
net/bluetooth/hci_sysfs.c +0 -5
@@ -5,11 +5,6 @@#include <net/bluetooth/bluetooth.h> #include <net/bluetooth/hci_core.h> -#ifndef CONFIG_BT_HCI_CORE_DEBUG -#undef BT_DBG -#define BT_DBG( A... ) -#endif -static ssize_t show_name (struct class_device *cdev,char *buf) {struct hci_dev *hdev =class_get_devdata (cdev);
Marcel Holtmann
maintainerHi Fabian,
Quoted 2 lines
HCI Core debug context is redefined 4 times in mm1 bluetooth
module.Here's a trivial patch to have it inhci_core.h(only).
this posting is on the wrong mailing list. Send such requests to the BlueZ developer mailing list and not the LKML. However I am not going to apply it, because everything is fine as it is.
Regards
Marcel