Browse Source

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>
Marcel Holtmann 10 years ago
parent
commit
65efd2bf48

+ 15 - 5
net/bluetooth/Kconfig

@@ -39,11 +39,10 @@ menuconfig BT
 	  to Bluetooth kernel modules are provided in the BlueZ packages.  For
 	  to Bluetooth kernel modules are provided in the BlueZ packages.  For
 	  more information, see <http://www.bluez.org/>.
 	  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"
 source "net/bluetooth/rfcomm/Kconfig"
 
 
@@ -53,4 +52,15 @@ source "net/bluetooth/cmtp/Kconfig"
 
 
 source "net/bluetooth/hidp/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"
 source "drivers/bluetooth/Kconfig"

+ 1 - 1
net/bluetooth/bnep/Kconfig

@@ -1,6 +1,6 @@
 config BT_BNEP
 config BT_BNEP
 	tristate "BNEP protocol support"
 	tristate "BNEP protocol support"
-	depends on BT
+	depends on BT_BREDR
 	select CRC32
 	select CRC32
 	help
 	help
 	  BNEP (Bluetooth Network Encapsulation Protocol) is Ethernet
 	  BNEP (Bluetooth Network Encapsulation Protocol) is Ethernet

+ 1 - 1
net/bluetooth/cmtp/Kconfig

@@ -1,6 +1,6 @@
 config BT_CMTP
 config BT_CMTP
 	tristate "CMTP protocol support"
 	tristate "CMTP protocol support"
-	depends on BT && ISDN_CAPI
+	depends on BT_BREDR && ISDN_CAPI
 	help
 	help
 	  CMTP (CAPI Message Transport Protocol) is a transport layer
 	  CMTP (CAPI Message Transport Protocol) is a transport layer
 	  for CAPI messages.  CMTP is required for the Bluetooth Common
 	  for CAPI messages.  CMTP is required for the Bluetooth Common

+ 1 - 1
net/bluetooth/hidp/Kconfig

@@ -1,6 +1,6 @@
 config BT_HIDP
 config BT_HIDP
 	tristate "HIDP protocol support"
 	tristate "HIDP protocol support"
-	depends on BT && INPUT
+	depends on BT_BREDR && INPUT
 	select HID
 	select HID
 	help
 	help
 	  HIDP (Human Interface Device Protocol) is a transport layer
 	  HIDP (Human Interface Device Protocol) is a transport layer

+ 1 - 1
net/bluetooth/rfcomm/Kconfig

@@ -1,6 +1,6 @@
 config BT_RFCOMM
 config BT_RFCOMM
 	tristate "RFCOMM protocol support"
 	tristate "RFCOMM protocol support"
-	depends on BT
+	depends on BT_BREDR
 	help
 	help
 	  RFCOMM provides connection oriented stream transport.  RFCOMM
 	  RFCOMM provides connection oriented stream transport.  RFCOMM
 	  support is required for Dialup Networking, OBEX and other Bluetooth
 	  support is required for Dialup Networking, OBEX and other Bluetooth