diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-06-22 16:06:58 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-06-22 16:06:58 -0400 |
| commit | 1c1236e3af9c0a52e63c1c386413f13627e68e67 (patch) | |
| tree | 554430c73c927a8a3fcab132cad83f4a04a7626d /net/bluetooth/Kconfig | |
| parent | e10542c447abf7c840931ff12f7d0dee976ca2ea (diff) | |
| parent | 43f3dc41571c47a1fbded9aca1cf0a737967b005 (diff) | |
| download | op-kernel-dev-1c1236e3af9c0a52e63c1c386413f13627e68e67.zip op-kernel-dev-1c1236e3af9c0a52e63c1c386413f13627e68e67.tar.gz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-next-2.6
Diffstat (limited to 'net/bluetooth/Kconfig')
| -rw-r--r-- | net/bluetooth/Kconfig | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/net/bluetooth/Kconfig b/net/bluetooth/Kconfig index 6ae5ec5..f495dea 100644 --- a/net/bluetooth/Kconfig +++ b/net/bluetooth/Kconfig @@ -22,6 +22,7 @@ menuconfig BT BNEP Module (Bluetooth Network Encapsulation Protocol) CMTP Module (CAPI Message Transport Protocol) HIDP Module (Human Interface Device Protocol) + SMP Module (Security Manager Protocol) Say Y here to compile Bluetooth support into the kernel or say M to compile it as module (bluetooth). @@ -36,11 +37,18 @@ if BT != n config BT_L2CAP bool "L2CAP protocol support" select CRC16 + select CRYPTO + select CRYPTO_BLKCIPHER + select CRYPTO_AES + select CRYPTO_ECB help L2CAP (Logical Link Control and Adaptation Protocol) provides connection oriented and connection-less data transport. L2CAP support is required for most Bluetooth applications. + Also included is support for SMP (Security Manager Protocol) which + is the security layer on top of LE (Low Energy) links. + config BT_SCO bool "SCO links support" help |
