* [PATCH] Bluetooth: remove direct compilation of 6lowpan_iphc.c
@ 2014-01-17 19:29 Stephen Warren
2014-01-17 19:41 ` Randy Dunlap
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Stephen Warren @ 2014-01-17 19:29 UTC (permalink / raw)
To: David S. Miller
Cc: Dmitry Eremin-Solenikov, Marcel Holtmann, Stephen Rothwell,
linux-next, linux-kernel, linux-zigbee-devel, Alexander Smirnov,
netdev, Jukka Rissanen, Stephen Warren
From: Stephen Warren <swarren@nvidia.com>
It's now built as a separate utility module, and enabling BT selects
that module in Kconfig. This fixes:
net/ieee802154/built-in.o:(___ksymtab_gpl+lowpan_process_data+0x0): multiple definition of `__ksymtab_lowpan_process_data'
net/bluetooth/built-in.o:(___ksymtab_gpl+lowpan_process_data+0x0): first defined here
net/ieee802154/built-in.o:(___ksymtab_gpl+lowpan_header_compress+0x0): multiple definition of `__ksymtab_lowpan_header_compress'
net/bluetooth/built-in.o:(___ksymtab_gpl+lowpan_header_compress+0x0): first defined here
net/ieee802154/built-in.o: In function `lowpan_header_compress':
net/ieee802154/6lowpan_iphc.c:606: multiple definition of `lowpan_header_compress'
net/bluetooth/built-in.o:/home/swarren/shared/git_wa/kernel/kernel.git/net/bluetooth/../ieee802154/6lowpan_iphc.c:606: first defined here
net/ieee802154/built-in.o: In function `lowpan_process_data':
net/ieee802154/6lowpan_iphc.c:344: multiple definition of `lowpan_process_data'
net/bluetooth/built-in.o:/home/swarren/shared/git_wa/kernel/kernel.git/net/bluetooth/../ieee802154/6lowpan_iphc.c:344: first defined here
make[1]: *** [net/built-in.o] Error 1
(this change probably simply wasn't "git add"d to a53d34c3465b)
Fixes: a53d34c3465b ("net: move 6lowpan compression code to separate module")
Fixes: 18722c247023 ("Bluetooth: Enable 6LoWPAN support for BT LE devices")
Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
net/bluetooth/Makefile | 4 ----
1 file changed, 4 deletions(-)
diff --git a/net/bluetooth/Makefile b/net/bluetooth/Makefile
index cc6827e2ce68..80cb215826e8 100644
--- a/net/bluetooth/Makefile
+++ b/net/bluetooth/Makefile
@@ -12,8 +12,4 @@ bluetooth-y := af_bluetooth.o hci_core.o hci_conn.o hci_event.o mgmt.o \
hci_sock.o hci_sysfs.o l2cap_core.o l2cap_sock.o smp.o sco.o lib.o \
a2mp.o amp.o 6lowpan.o
-ifeq ($(CONFIG_IEEE802154_6LOWPAN),)
- bluetooth-y += ../ieee802154/6lowpan_iphc.o
-endif
-
subdir-ccflags-y += -D__CHECK_ENDIAN__
--
1.8.1.5
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] Bluetooth: remove direct compilation of 6lowpan_iphc.c
2014-01-17 19:29 [PATCH] Bluetooth: remove direct compilation of 6lowpan_iphc.c Stephen Warren
@ 2014-01-17 19:41 ` Randy Dunlap
2014-01-17 20:19 ` Marcel Holtmann
2014-01-18 3:10 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: Randy Dunlap @ 2014-01-17 19:41 UTC (permalink / raw)
To: Stephen Warren, David S. Miller
Cc: Dmitry Eremin-Solenikov, Marcel Holtmann, Stephen Rothwell,
linux-next, linux-kernel, linux-zigbee-devel, Alexander Smirnov,
netdev, Jukka Rissanen, Stephen Warren
On 01/17/2014 11:29 AM, Stephen Warren wrote:
> From: Stephen Warren <swarren@nvidia.com>
>
> It's now built as a separate utility module, and enabling BT selects
> that module in Kconfig. This fixes:
>
> net/ieee802154/built-in.o:(___ksymtab_gpl+lowpan_process_data+0x0): multiple definition of `__ksymtab_lowpan_process_data'
> net/bluetooth/built-in.o:(___ksymtab_gpl+lowpan_process_data+0x0): first defined here
> net/ieee802154/built-in.o:(___ksymtab_gpl+lowpan_header_compress+0x0): multiple definition of `__ksymtab_lowpan_header_compress'
> net/bluetooth/built-in.o:(___ksymtab_gpl+lowpan_header_compress+0x0): first defined here
> net/ieee802154/built-in.o: In function `lowpan_header_compress':
> net/ieee802154/6lowpan_iphc.c:606: multiple definition of `lowpan_header_compress'
> net/bluetooth/built-in.o:/home/swarren/shared/git_wa/kernel/kernel.git/net/bluetooth/../ieee802154/6lowpan_iphc.c:606: first defined here
> net/ieee802154/built-in.o: In function `lowpan_process_data':
> net/ieee802154/6lowpan_iphc.c:344: multiple definition of `lowpan_process_data'
> net/bluetooth/built-in.o:/home/swarren/shared/git_wa/kernel/kernel.git/net/bluetooth/../ieee802154/6lowpan_iphc.c:344: first defined here
> make[1]: *** [net/built-in.o] Error 1
>
> (this change probably simply wasn't "git add"d to a53d34c3465b)
>
> Fixes: a53d34c3465b ("net: move 6lowpan compression code to separate module")
> Fixes: 18722c247023 ("Bluetooth: Enable 6LoWPAN support for BT LE devices")
> Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Thanks.
> ---
> net/bluetooth/Makefile | 4 ----
> 1 file changed, 4 deletions(-)
>
> diff --git a/net/bluetooth/Makefile b/net/bluetooth/Makefile
> index cc6827e2ce68..80cb215826e8 100644
> --- a/net/bluetooth/Makefile
> +++ b/net/bluetooth/Makefile
> @@ -12,8 +12,4 @@ bluetooth-y := af_bluetooth.o hci_core.o hci_conn.o hci_event.o mgmt.o \
> hci_sock.o hci_sysfs.o l2cap_core.o l2cap_sock.o smp.o sco.o lib.o \
> a2mp.o amp.o 6lowpan.o
>
> -ifeq ($(CONFIG_IEEE802154_6LOWPAN),)
> - bluetooth-y += ../ieee802154/6lowpan_iphc.o
> -endif
> -
> subdir-ccflags-y += -D__CHECK_ENDIAN__
>
--
~Randy
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] Bluetooth: remove direct compilation of 6lowpan_iphc.c
2014-01-17 19:29 [PATCH] Bluetooth: remove direct compilation of 6lowpan_iphc.c Stephen Warren
2014-01-17 19:41 ` Randy Dunlap
@ 2014-01-17 20:19 ` Marcel Holtmann
2014-01-18 3:10 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: Marcel Holtmann @ 2014-01-17 20:19 UTC (permalink / raw)
To: Stephen Warren
Cc: David S. Miller, Dmitry Eremin-Solenikov, Stephen Rothwell,
linux-next, linux-kernel, linux-zigbee-devel, Alexander Smirnov,
Network Development, Jukka Rissanen, Stephen Warren
Hi Stephen,
> It's now built as a separate utility module, and enabling BT selects
> that module in Kconfig. This fixes:
>
> net/ieee802154/built-in.o:(___ksymtab_gpl+lowpan_process_data+0x0): multiple definition of `__ksymtab_lowpan_process_data'
> net/bluetooth/built-in.o:(___ksymtab_gpl+lowpan_process_data+0x0): first defined here
> net/ieee802154/built-in.o:(___ksymtab_gpl+lowpan_header_compress+0x0): multiple definition of `__ksymtab_lowpan_header_compress'
> net/bluetooth/built-in.o:(___ksymtab_gpl+lowpan_header_compress+0x0): first defined here
> net/ieee802154/built-in.o: In function `lowpan_header_compress':
> net/ieee802154/6lowpan_iphc.c:606: multiple definition of `lowpan_header_compress'
> net/bluetooth/built-in.o:/home/swarren/shared/git_wa/kernel/kernel.git/net/bluetooth/../ieee802154/6lowpan_iphc.c:606: first defined here
> net/ieee802154/built-in.o: In function `lowpan_process_data':
> net/ieee802154/6lowpan_iphc.c:344: multiple definition of `lowpan_process_data'
> net/bluetooth/built-in.o:/home/swarren/shared/git_wa/kernel/kernel.git/net/bluetooth/../ieee802154/6lowpan_iphc.c:344: first defined here
> make[1]: *** [net/built-in.o] Error 1
>
> (this change probably simply wasn't "git add"d to a53d34c3465b)
>
> Fixes: a53d34c3465b ("net: move 6lowpan compression code to separate module")
> Fixes: 18722c247023 ("Bluetooth: Enable 6LoWPAN support for BT LE devices")
> Signed-off-by: Stephen Warren <swarren@nvidia.com>
seems that I missed the initial patch that changes this to build this as separate module. Please CC linux-bluetooth@vger.kernel.org so that we do not accidentally miss these changes.
Our initial idea was to create net/core/6lowpan_iphc.c or maybe net/6lowpan/iphc.c module to make it clear that this is independent from IEEE 802.15.4 and Bluetooth. However we started to do this inside net/ieee802154 to this started.
Should we do the change now and move it into its separate directory.
Regards
Marcel
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] Bluetooth: remove direct compilation of 6lowpan_iphc.c
2014-01-17 19:29 [PATCH] Bluetooth: remove direct compilation of 6lowpan_iphc.c Stephen Warren
2014-01-17 19:41 ` Randy Dunlap
2014-01-17 20:19 ` Marcel Holtmann
@ 2014-01-18 3:10 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2014-01-18 3:10 UTC (permalink / raw)
To: swarren
Cc: dbaryshkov, marcel, sfr, linux-next, linux-kernel,
linux-zigbee-devel, alex.bluesman.smirnov, netdev,
jukka.rissanen, swarren
From: Stephen Warren <swarren@wwwdotorg.org>
Date: Fri, 17 Jan 2014 12:29:24 -0700
> From: Stephen Warren <swarren@nvidia.com>
>
> It's now built as a separate utility module, and enabling BT selects
> that module in Kconfig. This fixes:
...
> (this change probably simply wasn't "git add"d to a53d34c3465b)
>
> Fixes: a53d34c3465b ("net: move 6lowpan compression code to separate module")
> Fixes: 18722c247023 ("Bluetooth: Enable 6LoWPAN support for BT LE devices")
> Signed-off-by: Stephen Warren <swarren@nvidia.com>
Applied to net-next, thanks a lot.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-01-18 3:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-01-17 19:29 [PATCH] Bluetooth: remove direct compilation of 6lowpan_iphc.c Stephen Warren
2014-01-17 19:41 ` Randy Dunlap
2014-01-17 20:19 ` Marcel Holtmann
2014-01-18 3:10 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).