luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bluetooth: Remove L2CAP Extended Features from Kconfig

Browse Source 
This reverts commit 84fb0a6334 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: Gustavo F. Padovan <padovan@profusion.mobi>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Gustavo F. Padovan 2010-05-10 14:26:11 -03:00 committed by Marcel Holtmann
parent fd059b9bd0
commit 0b31c85ce7
2 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
net/bluetooth/Kconfig
View File

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

4
net/bluetooth/l2cap.c
View File

@ -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, };