Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7784d78f authored by Andrei Emeltchenko's avatar Andrei Emeltchenko Committed by Gustavo Padovan
Browse files

Bluetooth: making enable_hs independent from L2CAP 



Fixes bluetooth compiling when CONFIG_BT_L2CAP is not enabled

net/built-in.o: In function `hci_dev_open':
(.text+0xdce9a): undefined reference to `enable_hs'

Reported-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
Signed-off-by: default avatarAndrei Emeltchenko <andrei.emeltchenko@intel.com>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent c768708a

net/bluetooth/hci_core.c

+5 −0
Original line number Diff line number Diff line
@@ -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);
@@ -2613,3 +2615,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");

net/bluetooth/l2cap_core.c

+0 −4
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ 
#include <net/bluetooth/smp.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, };
@@ -4774,6 +4773,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");