netdev - Re: [PATCH net-next 1/2] 6lowpan: introduce new net/6lowpan directory

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-prev] [thread-next>] [day] [month] [year] [list]

Date:	Sat, 12 Jul 2014 01:58:26 +0200
From:	Marcel Holtmann <marcel@...tmann.org>
To:	Alexander Aring <alex.aring@...il.com>
Cc:	Network Development <netdev@...r.kernel.org>,
	Jukka Rissanen <jukka.rissanen@...ux.intel.com>,
	linux-zigbee-devel@...ts.sourceforge.net,
	linux-bluetooth@...r.kernel.org
Subject: Re: [PATCH net-next 1/2] 6lowpan: introduce new net/6lowpan directory

Hi Alexander,

>>>>> index cbbbe6d..7ed1970 100644
>>>>> --- a/net/Makefile
>>>>> +++ b/net/Makefile
>>>>> @@ -57,7 +57,8 @@ obj-$(CONFIG_CAIF)		+= caif/
>>>>> ifneq ($(CONFIG_DCB),)
>>>>> obj-y				+= dcb/
>>>>> endif
>>>>> -obj-y				+= ieee802154/
>>>>> +obj-$(CONFIG_6LOWPAN)		+= 6lowpan/
>>>>> +obj-$(CONFIG_IEEE802154)	+= ieee802154/
>>>>> obj-$(CONFIG_MAC802154)		+= mac802154/
>>>>> 
>>>>> ifeq ($(CONFIG_NET),y)
>>>>> diff --git a/net/bluetooth/Kconfig b/net/bluetooth/Kconfig
>>>>> index 06ec144..a54777d 100644
>>>>> --- a/net/bluetooth/Kconfig
>>>>> +++ b/net/bluetooth/Kconfig
>>>>> @@ -6,7 +6,6 @@ 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 +41,7 @@ menuconfig BT
>>>>> 
>>>>> config BT_6LOWPAN
>>>>> 	bool "Bluetooth 6LoWPAN support"
>>>>> -	depends on BT && IPV6
>>>>> +	depends on BT && 6LOWPAN
>>>>> 	help
>>>>> 	  IPv6 compression over Bluetooth.
>>>> 
>>>> this will conflict with our changes in wireless-next tree. We converted out 6LoWPAN support into a separate module.
>>>> 
>>> 
>>> oops, sorry I didn't check on this. I simple based it on net-next,
>>> because the patch series adds a new branch.
>>> 
>>> 
>>> 
>>> btw. we need to talk about who branch will commit changes to iphc code
>>> to avoid conflicts.
>> 
>> a few years back we decided to merge bluetooth-next via John's wireless-next tree so that any interaction with 802.11 and Bluetooth can be sorted out in John's tree. We are now also merging NFC into the wireless-next tree.
>> 
>> So it might be a good idea to include the 6LoWPAN parts into the wireless-next tree as well. If there are conflicts with 802.15.4, maybe that should also go through his trees.
>> 
> 
> Ok. I am maintainer since three days ago and I need some time to setup
> my infrastructure, then I will ask him. At the end I need to update the
> MAINTAINERS file to the new infrastructure.
> 
>> If you want I can also take the net/6lowpan stuff through bluetooth-next tree.
>> 
> 
> Yes, please Marcel. This is one file at the moment. I have in my local
> branch also some patches (most of them use IPv6 API for address scopes
> instead using the self builded macros). There is also a issue with error
> handling which should be a long overdue fix. You will get some patches
> for these issues in the next days.

I resolved the conflict locally in bluetooth-next and applied both of your patches to bluetooth-next tree.

Regards

Marcel

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