aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-03-13 06:31:41 -0400
committerMarcel Holtmann <marcel@holtmann.org>2014-03-13 10:05:10 -0400
commit52d3ef5c2537d1b892d5fefff754b995394d7be3 (patch)
tree9a844f680dd26a1d4dadb75c34d9367c62b2b8c0 /net
parentdcf4adbfdc7ad14ca50c1133f93f998c78493c2d (diff)
Bluetooth: make sure 6LOWPAN_IPHC is built-in if needed
Commit 975508879 "Bluetooth: make bluetooth 6lowpan as an option" ensures that 6LOWPAN_IPHC is turned on when we have BT_6LOWPAN enabled in Kconfig, but it allows building the IPHC code as a loadable module even if the entire Bluetooth stack is built-in, and that causes a link error. We can solve that by moving the 'select' statement into CONFIG_BT, which is a "tristate" option to enforce that 6LOWPAN_IPHC can only be a module if BT also is a module. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/Kconfig b/net/bluetooth/Kconfig
index 10c752f18feb..06ec14499ca1 100644
--- a/net/bluetooth/Kconfig
+++ b/net/bluetooth/Kconfig
@@ -6,6 +6,7 @@ menuconfig BT
6 tristate "Bluetooth subsystem support" 6 tristate "Bluetooth subsystem support"
7 depends on NET && !S390 7 depends on NET && !S390
8 depends on RFKILL || !RFKILL 8 depends on RFKILL || !RFKILL
9 select 6LOWPAN_IPHC if BT_6LOWPAN
9 select CRC16 10 select CRC16
10 select CRYPTO 11 select CRYPTO
11 select CRYPTO_BLKCIPHER 12 select CRYPTO_BLKCIPHER
@@ -42,7 +43,6 @@ menuconfig BT
42config BT_6LOWPAN 43config BT_6LOWPAN
43 bool "Bluetooth 6LoWPAN support" 44 bool "Bluetooth 6LoWPAN support"
44 depends on BT && IPV6 45 depends on BT && IPV6
45 select 6LOWPAN_IPHC
46 help 46 help
47 IPv6 compression over Bluetooth. 47 IPv6 compression over Bluetooth.
48 48