Bluetooth: Add Kconfig option for L2CAP Extended Features

The L2CAP Extended Features are still unstable and under development,
so we are adding them under the EXPERIMENTAL flag to get more feedback
on them. L2CAP Extended Features includes the Enhanced Retransmission
and Streaming Modes, Frame Check Sequence (FCS), and Segmentation and
Reassemby (SAR).

Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Reviewed-by: João Paulo Rechi Vita <jprvita@profusion.mobi>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/net/bluetooth/Kconfig b/net/bluetooth/Kconfig
index ed371684c133d184e9d68f87b85ea171f6107a13..ee3b3049d385839297d7a87e53fde0d6b5ec8456 100644 (file)
--- 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 187f46dd830981e9135e298fe0640c8f08a8affe..4c007203d66b4caa266e7e140a4d77d2091a1cfb 100644 (file)
--- 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;