From 67bba83bf300eeb4551306933de72feb6e2430d9 Mon Sep 17 00:00:00 2001 From: "Gustavo F. Padovan" Date: Mon, 10 May 2010 14:26:11 -0300 Subject: [PATCH] --- yaml --- r: 203822 b: refs/heads/master c: 0b31c85ce78d3646ac1e90d62969e7cd8cfd8b15 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/bluetooth/Kconfig | 13 ------------- trunk/net/bluetooth/l2cap.c | 4 ---- 3 files changed, 1 insertion(+), 18 deletions(-) diff --git a/[refs] b/[refs] index b1cfedaca0cc..8f4ff36e5a09 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fd059b9bd0af2e217f29d5a34e1c71039d26af8c +refs/heads/master: 0b31c85ce78d3646ac1e90d62969e7cd8cfd8b15 diff --git a/trunk/net/bluetooth/Kconfig b/trunk/net/bluetooth/Kconfig index ee3b3049d385..ed371684c133 100644 --- a/trunk/net/bluetooth/Kconfig +++ b/trunk/net/bluetooth/Kconfig @@ -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 diff --git a/trunk/net/bluetooth/l2cap.c b/trunk/net/bluetooth/l2cap.c index fd507cbc7932..6c5462b2a244 100644 --- a/trunk/net/bluetooth/l2cap.c +++ b/trunk/net/bluetooth/l2cap.c @@ -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, };