netdev - [PATCH] Bluetooth: remove direct compilation of 6lowpan

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <1389986964-5177-1-git-send-email-swarren@wwwdotorg.org>
Date:	Fri, 17 Jan 2014 12:29:24 -0700
From:	Stephen Warren <swarren@...dotorg.org>
To:	"David S. Miller" <davem@...emloft.net>
Cc:	Dmitry Eremin-Solenikov <dbaryshkov@...il.com>,
	Marcel Holtmann <marcel@...tmann.org>,
	Stephen Rothwell <sfr@...b.auug.org.au>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	linux-zigbee-devel@...ts.sourceforge.net,
	Alexander Smirnov <alex.bluesman.smirnov@...il.com>,
	netdev@...r.kernel.org,
	Jukka Rissanen <jukka.rissanen@...ux.intel.com>,
	Stephen Warren <swarren@...dia.com>
Subject: [PATCH] Bluetooth: remove direct compilation of 6lowpan_iphc.c

From: Stephen Warren <swarren@...dia.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@...dia.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

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html