2011-11-17 17:50:39

by Randy Dunlap

Subject: Re: linux-next: Tree for Nov 17 (bluetooth)

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'

--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

2011-11-18 13:41:17

by Andrei Emeltchenko

Subject: Re: linux-next: Tree for Nov 17 (bluetooth)

Hi Gustavo,

On Fri, Nov 18, 2011 at 11:30:17AM -0200, Gustavo Padovan wrote:
> Hi Andrei,
>
> * Andrei Emeltchenko <[email protected]> [2011-11-18 11:58:58 +0200]:
>
> > 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:
>
> This is ok, please send a proper git patch so I can apply it.

The patch is already sent to linux-bluetooth

Best regards
Andrei Emeltchenko

2011-11-18 13:30:17

by Gustavo Padovan

Subject: Re: linux-next: Tree for Nov 17 (bluetooth)

Hi Andrei,

* Andrei Emeltchenko <[email protected]> [2011-11-18 11:58:58 +0200]:

> 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:

This is ok, please send a proper git patch so I can apply it.

Gustavo

2011-11-18 09:58:58

by Andrei Emeltchenko

Subject: Re: linux-next: Tree for Nov 17 (bluetooth)

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