[PATCH] Bluetooth: make sure 6LOWPAN_IPHC is built-in if needed

[PATCH] Bluetooth: make sure 6LOWPAN_IPHC is built-in if needed

[Arnd Bergmann]

>From 5c094e2f8e556b27a73607fc39d33944c1ec3384 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 13 Mar 2014 11:27:21 +0100
Subject: [PATCH] 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>

diff --git a/net/bluetooth/Kconfig b/net/bluetooth/Kconfig
index 10c752f..06ec144 100644
--- a/net/bluetooth/Kconfig
+++ b/net/bluetooth/Kconfig
@@ -6,6 +6,7 @@ menuconfig BT
 	tristate "Bluetooth subsystem support"
 	depends on NET && !S390
 	depends on RFKILL || !RFKILL
+	select 6LOWPAN_IPHC if BT_6LOWPAN
 	select CRC16
 	select CRYPTO
 	select CRYPTO_BLKCIPHER
@@ -42,7 +43,6 @@ menuconfig BT
 config BT_6LOWPAN
 	bool "Bluetooth 6LoWPAN support"
 	depends on BT && IPV6
-	select 6LOWPAN_IPHC
 	help
 	  IPv6 compression over Bluetooth.
 

Re: [PATCH] Bluetooth: make sure 6LOWPAN_IPHC is built-in if needed

[Alexander Aring]

Hi Arnd,

On Thu, Mar 13, 2014 at 11:31:41AM +0100, Arnd Bergmann wrote:
> From 5c094e2f8e556b27a73607fc39d33944c1ec3384 Mon Sep 17 00:00:00 2001
> From: Arnd Bergmann <arnd@arndb.de>
> Date: Thu, 13 Mar 2014 11:27:21 +0100
> Subject: [PATCH] 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.

how do you get this link error? I don't see any linking error.

But I know what you mean, because we have a bool and not a tristate
here and then 6LOWPAN_IPHC is always built-in.

Thanks for fixing this.

- Alex

Re: [PATCH] Bluetooth: make sure 6LOWPAN_IPHC is built-in if needed

[Marcel Holtmann]

Hi Arnd,

> From 5c094e2f8e556b27a73607fc39d33944c1ec3384 Mon Sep 17 00:00:00 2001
> From: Arnd Bergmann <arnd@arndb.de>
> Date: Thu, 13 Mar 2014 11:27:21 +0100
> Subject: [PATCH] Bluetooth: make sure 6LOWPAN_IPHC is built-in if needed

no idea what your email client did here, but I had to manually fix this up.

> 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>

patch has been applied to bluetooth-next tree.

Regards

Marcel