Commit 0b31c85c authored by Gustavo Padovan's avatar Gustavo Padovan Committed by Marcel Holtmann
Browse files

Bluetooth: Remove L2CAP Extended Features from Kconfig 



This reverts commit 84fb0a63 which adds
the L2CAP Extended Features to the Kconfig, that is actually not needed.
One can use other mechanisms to enable L2CAP Extended Features.

Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent fd059b9b

net/bluetooth/Kconfig

+0 −13
Original line number Diff line number Diff line
@@ -43,19 +43,6 @@ config BT_L2CAP 
	  Say Y here to compile L2CAP support into the kernel or say M to

	  compile it as module (l2cap).



config BT_L2CAP_EXT_FEATURES

	bool "L2CAP Extended Features support (EXPERIMENTAL)"

	depends on BT_L2CAP && EXPERIMENTAL

	help

	  This option enables the L2CAP Extended Features support. These

	  new features include the Enhanced Retransmission and Streaming

	  Modes, the Frame Check Sequence (FCS), and Segmentation and

	  Reassembly (SAR) for L2CAP packets. They are a required for the

	  new Alternate MAC/PHY and the Bluetooth Medical Profile.



	  You should say N unless you know what you are doing. Note that

	  this is in an experimental state yet.



config BT_SCO

	tristate "SCO links support"

	depends on BT

net/bluetooth/l2cap.c

+0 −4
Original line number Diff line number Diff line
@@ -55,11 +55,7 @@ 


#define VERSION "2.14"



#ifdef CONFIG_BT_L2CAP_EXT_FEATURES

static int enable_ertm = 1;

#else

static int enable_ertm = 0;

#endif



static u32 l2cap_feat_mask = L2CAP_FEAT_FIXED_CHAN;

static u8 l2cap_fixed_chan[8] = { 0x02, };