From: FabF <Fabian.Frederick@skynet.be>
To: lkml <linux-kernel@vger.kernel.org>
Cc: Andrew Morton <akpm@osdl.org>
Subject: [PATCH 2.6.6-mm1] bluetooth definition redundancy fix
Date: Wed, 12 May 2004 19:12:50 +0200 [thread overview]
Message-ID: <1084381970.7894.4.camel@bluerhyme.real3> (raw)
[-- Attachment #1: Type: text/plain, Size: 145 bytes --]
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
[-- Attachment #2: bluetooth1.diff --]
[-- Type: text/x-patch, Size: 2507 bytes --]
diff -Naur orig/include/net/bluetooth/hci_core.h edited/include/net/bluetooth/hci_core.h
--- orig/include/net/bluetooth/hci_core.h 2004-05-10 04:32:37.000000000 +0200
+++ edited/include/net/bluetooth/hci_core.h 2004-05-12 18:54:20.000000000 +0200
@@ -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
diff -Naur orig/net/bluetooth/hci_conn.c edited/net/bluetooth/hci_conn.c
--- orig/net/bluetooth/hci_conn.c 2004-05-10 04:33:21.000000000 +0200
+++ edited/net/bluetooth/hci_conn.c 2004-05-12 18:55:00.000000000 +0200
@@ -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;
diff -Naur orig/net/bluetooth/hci_core.c edited/net/bluetooth/hci_core.c
--- orig/net/bluetooth/hci_core.c 2004-05-10 04:32:26.000000000 +0200
+++ edited/net/bluetooth/hci_core.c 2004-05-12 18:55:08.000000000 +0200
@@ -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);
diff -Naur orig/net/bluetooth/hci_sock.c edited/net/bluetooth/hci_sock.c
--- orig/net/bluetooth/hci_sock.c 2004-05-10 04:32:38.000000000 +0200
+++ edited/net/bluetooth/hci_sock.c 2004-05-12 18:59:34.000000000 +0200
@@ -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)
diff -Naur orig/net/bluetooth/hci_sysfs.c edited/net/bluetooth/hci_sysfs.c
--- orig/net/bluetooth/hci_sysfs.c 2004-05-10 04:33:04.000000000 +0200
+++ edited/net/bluetooth/hci_sysfs.c 2004-05-12 18:59:45.000000000 +0200
@@ -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);
next reply other threads:[~2004-05-11 17:43 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-05-12 17:12 FabF [this message]
2004-05-12 13:53 ` Marcel Holtmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1084381970.7894.4.camel@bluerhyme.real3 \
--to=fabian.frederick@skynet.be \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®