Bluetooth: Introduce BT_BREDR and BT_LE config options

The current kernel options do not make it clear which modules are for
Bluetooth Classic (BR/EDR) and which are for Bluetooth Low Energy (LE).

To make it really clear, introduce BT_BREDR and BT_LE options with
proper dependencies into the different modules. Both new options
default to y to not create a regression with previous kernel config
files.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>

diff --git a/net/bluetooth/Kconfig b/net/bluetooth/Kconfig
index 600fb29288f47c48ce17583d769d502746854bd1..5e97a8ff850b95e5aaa40be87cae3285041d8527 100644 (file)
--- a/net/bluetooth/Kconfig
+++ b/net/bluetooth/Kconfig
@@ -39,11 +39,10 @@ menuconfig BT
          to Bluetooth kernel modules are provided in the BlueZ packages.  For
          more information, see <http://www.bluez.org/>.
 
-config BT_6LOWPAN
-       tristate "Bluetooth 6LoWPAN support"
-       depends on BT && 6LOWPAN
-       help
-         IPv6 compression over Bluetooth Low Energy.
+config BT_BREDR
+       bool "Bluetooth Classic (BR/EDR) features"
+       depends on BT
+       default y
 
 source "net/bluetooth/rfcomm/Kconfig"
 
@@ -53,4 +52,15 @@ source "net/bluetooth/cmtp/Kconfig"
 
 source "net/bluetooth/hidp/Kconfig"
 
+config BT_LE
+       bool "Bluetooth Low Energy (LE) features"
+       depends on BT
+       default y
+
+config BT_6LOWPAN
+       tristate "Bluetooth 6LoWPAN support"
+       depends on BT_LE && 6LOWPAN
+       help
+         IPv6 compression over Bluetooth Low Energy.
+
 source "drivers/bluetooth/Kconfig"

diff --git a/net/bluetooth/bnep/Kconfig b/net/bluetooth/bnep/Kconfig
index 71791fc9f6b1f93269880071af6150e3d67d2d72..9b70317c49dc8a7ba1534e8504b9ea3c1bc8d526 100644 (file)
--- a/net/bluetooth/bnep/Kconfig
+++ b/net/bluetooth/bnep/Kconfig
@@ -1,6 +1,6 @@
 config BT_BNEP
        tristate "BNEP protocol support"
-       depends on BT
+       depends on BT_BREDR
        select CRC32
        help
          BNEP (Bluetooth Network Encapsulation Protocol) is Ethernet

diff --git a/net/bluetooth/cmtp/Kconfig b/net/bluetooth/cmtp/Kconfig
index 94cbf42ce155b290ab0a4da9e975432006a6b6de..939da0fbdd88628f73a471ba9bfa6148546701b2 100644 (file)
--- a/net/bluetooth/cmtp/Kconfig
+++ b/net/bluetooth/cmtp/Kconfig
@@ -1,6 +1,6 @@
 config BT_CMTP
        tristate "CMTP protocol support"
-       depends on BT && ISDN_CAPI
+       depends on BT_BREDR && ISDN_CAPI
        help
          CMTP (CAPI Message Transport Protocol) is a transport layer
          for CAPI messages.  CMTP is required for the Bluetooth Common

diff --git a/net/bluetooth/hidp/Kconfig b/net/bluetooth/hidp/Kconfig
index 9332bc7aa851fb798533cd5695fd260de68c242f..bc8610b24077eb4bb917824eda7268c9a0cec5bd 100644 (file)
--- a/net/bluetooth/hidp/Kconfig
+++ b/net/bluetooth/hidp/Kconfig
@@ -1,6 +1,6 @@
 config BT_HIDP
        tristate "HIDP protocol support"
-       depends on BT && INPUT
+       depends on BT_BREDR && INPUT
        select HID
        help
          HIDP (Human Interface Device Protocol) is a transport layer

diff --git a/net/bluetooth/rfcomm/Kconfig b/net/bluetooth/rfcomm/Kconfig
index 18d352ea2bc7e2a38672fda575a602b6a0ccab0d..335df751522064192b4a83270a657724482065b7 100644 (file)
--- a/net/bluetooth/rfcomm/Kconfig
+++ b/net/bluetooth/rfcomm/Kconfig
@@ -1,6 +1,6 @@
 config BT_RFCOMM
        tristate "RFCOMM protocol support"
-       depends on BT
+       depends on BT_BREDR
        help
          RFCOMM provides connection oriented stream transport.  RFCOMM
          support is required for Dialup Networking, OBEX and other Bluetooth