Bluetooth: Remove L2CAP Extended Features from Kconfig

This reverts commit 84fb0a6334af0ccad3544f6972c055d90fbb9fbe 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>

diff --git a/net/bluetooth/Kconfig b/net/bluetooth/Kconfig
index ee3b3049d385839297d7a87e53fde0d6b5ec8456..ed371684c133d184e9d68f87b85ea171f6107a13 100644 (file)
--- a/net/bluetooth/Kconfig
+++ b/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/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index fd507cbc79323ef76df9c77d3e8aa3914e40da91..6c5462b2a2442893a961c083fdfcc5fb731cb6b3 100644 (file)
--- a/net/bluetooth/l2cap.c
+++ b/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, };