From: Andrei Emeltchenko <andrei.emeltchenko.news@gmail•com>
To: Randy Dunlap <rdunlap@xenotime•net>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
linux-next@vger•kernel.org, LKML <linux-kernel@vger•kernel.org>,
Marcel Holtmann <marcel@holtmann•org>,
"Gustavo F. Padovan" <padovan@profusion•mobi>,
linux-bluetooth@vger•kernel.org
Subject: Re: linux-next: Tree for Nov 17 (bluetooth)
Date: Fri, 18 Nov 2011 11:58:58 +0200 [thread overview]
Message-ID: <20111118095855.GB9034@aemeltch-MOBL1> (raw)
In-Reply-To: <4EC5496F.2080509@xenotime.net>
Hi Randy,
On Thu, Nov 17, 2011 at 09:50:39AM -0800, Randy Dunlap wrote:
> On 11/16/2011 08:07 PM, Stephen Rothwell wrote:
> > Hi all,
>
>
> When CONFIG_BT_L2CAP is not enabled:
>
> net/built-in.o: In function `hci_dev_open':
> (.text+0xdce9a): undefined reference to `enable_hs'
Despite not enabling L2CAP sounds strange we might find solution even for
this usage :-)
I am thinking about moving enable_hs to common part not depending on
CONFIG_BT_L2CAP option:
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index cfd399f..ed0a656 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -54,6 +54,8 @@
#define AUTO_OFF_TIMEOUT 2000
+int enable_hs;
+
static void hci_cmd_task(unsigned long arg);
static void hci_rx_task(unsigned long arg);
static void hci_tx_task(unsigned long arg);
@@ -2691,3 +2693,6 @@ int hci_cancel_inquiry(struct hci_dev *hdev)
return hci_send_cmd(hdev, HCI_OP_INQUIRY_CANCEL, 0, NULL);
}
+
+module_param(enable_hs, bool, 0644);
+MODULE_PARM_DESC(enable_hs, "Enable High Speed");
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index e49b6e5..f36bc3f 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -58,7 +58,6 @@
#include <net/bluetooth/a2mp.h>
int disable_ertm;
-int enable_hs;
static u32 l2cap_feat_mask = L2CAP_FEAT_FIXED_CHAN;
static u8 l2cap_fixed_chan[8] = { L2CAP_FC_L2CAP, };
@@ -4811,6 +4810,3 @@ void l2cap_exit(void)
module_param(disable_ertm, bool, 0644);
MODULE_PARM_DESC(disable_ertm, "Disable enhanced retransmission mode");
-
-module_param(enable_hs, bool, 0644);
-MODULE_PARM_DESC(enable_hs, "Enable High Speed");
Best regards
Andrei Emeltchenko
next prev parent reply other threads:[~2011-11-18 9:59 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-17 4:07 linux-next: Tree for Nov 17 Stephen Rothwell
2011-11-17 12:00 ` Alan Cox
2011-11-17 17:50 ` linux-next: Tree for Nov 17 (bluetooth) Randy Dunlap
2011-11-18 9:58 ` Andrei Emeltchenko [this message]
2011-11-18 13:30 ` Gustavo Padovan
2011-11-18 13:41 ` Andrei Emeltchenko
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=20111118095855.GB9034@aemeltch-MOBL1 \
--to=andrei.emeltchenko.news@gmail$(echo .)com \
--cc=linux-bluetooth@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=marcel@holtmann$(echo .)org \
--cc=padovan@profusion$(echo .)mobi \
--cc=rdunlap@xenotime$(echo .)net \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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