2 files changed, 17 insertions, 0 deletions

diff --git a/net/bluetooth/Kconfig b/net/bluetooth/Kconfig
index ed371684c133..ee3b3049d385 100644
--- a/net/bluetooth/Kconfig
+++ b/net/bluetooth/Kconfig
@@ -43,6 +43,19 @@ 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 187f46dd8309..4c007203d66b 100644
--- a/net/bluetooth/l2cap.c
+++ b/net/bluetooth/l2cap.c
@@ -55,7 +55,11 @@
 
 #define VERSION "2.14"
 
+#ifdef CONFIG_BT_L2CAP_EXT_FEATURES
+static int enable_ertm = 1;
+#else
 static int enable_ertm = 0;
+#endif
 static int max_transmit = L2CAP_DEFAULT_MAX_TX;
 static int tx_window = L2CAP_DEFAULT_TX_WINDOW;