Hi,
this patch series add a new branch "net/6lowpan" for generic 6LoWPAN code.
Since commit 8df8c56a5abc70af5862aa7cac2875aeeb17a42b ("6lowpan: Moving
generic compression code into 6lowpan_iphc.c") the IPHC compression is shared
between bluetooth 6LoWPAN and IEEE 802.15.4 6LoWPAN. The new 6LoWPAN directory
will contain generic code for 6LoWPAN and futhermore 6LoWPAN upper layer
protocols.
The shared code between bluetooth and 802.15.4 should be review from both
communities. The current behaviour is that get_maintainers.pl returns the
IEEE 802.15.4 community only.
I request a new mailinglist for the IEEE 802.15.4 subsystem at vger but I didn't
get a response now so I add the current sourceforge IEEE 802.15.4 mailinglist to
the MAINTAINERS file. I will update them soon.
- Alex
Alexander Aring (2):
6lowpan: introduce new net/6lowpan directory
MAINTAINERS: add net/6lowpan/ maintainer entry
MAINTAINERS | 7 +++++++
net/6lowpan/Kconfig | 6 ++++++
net/6lowpan/Makefile | 3 +++
net/{ieee802154/6lowpan_iphc.c => 6lowpan/iphc.c} | 0
net/Kconfig | 1 +
net/Makefile | 3 ++-
net/bluetooth/Kconfig | 3 +--
net/ieee802154/Kconfig | 9 +--------
net/ieee802154/Makefile | 5 ++---
9 files changed, 23 insertions(+), 14 deletions(-)
create mode 100644 net/6lowpan/Kconfig
create mode 100644 net/6lowpan/Makefile
rename net/{ieee802154/6lowpan_iphc.c => 6lowpan/iphc.c} (100%)
--
2.0.1
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.
>>
> ok. Thanks.
>
> I notice there is a patch in net-next for the old file
> 4710d806fcb825156e0a7b3a81104915c5e90f5d ("6lowpan: mac802154: fix coding
> style issues").
>
> It's not in bluetooth-next currently and the movement patch should not
> occur any conflicts (I think). But I can't send you patches until this
> is in bluetooth-next.
I did a quick local test merge of bluetooth-next into net-next and git does the correct resolution (as far as I can tell) here. So this should not be a problem.
> I wait until the next sync of bluetooth-next with net-next and you should not
> apply any patches to "net/6lowpan/iphc.c" until that.
If they are not urgent, then lets wait until we merged everything into net-next.
Regards
Marcel
Hi Marcel,
On Sat, Jul 12, 2014 at 01:58:26AM +0200, Marcel Holtmann wrote:
> 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.
>
ok. Thanks.
I notice there is a patch in net-next for the old file
4710d806fcb825156e0a7b3a81104915c5e90f5d ("6lowpan: mac802154: fix coding
style issues").
It's not in bluetooth-next currently and the movement patch should not
occur any conflicts (I think). But I can't send you patches until this
is in bluetooth-next.
I wait until the next sync of bluetooth-next with net-next and you should not
apply any patches to "net/6lowpan/iphc.c" until that.
- Alex
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
Hi Marcel,
On Fri, Jul 11, 2014 at 02:33:03PM +0200, Marcel Holtmann wrote:
> 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.
If we have more implementation stuff in there, then we should setup a
own 6lowpan mailinglist maybe. At the moment this is fine.
Thanks.
- Alex
From: Marcel Holtmann <[email protected]>
Date: Fri, 11 Jul 2014 14:33:03 +0200
> If you want I can also take the net/6lowpan stuff through bluetooth-next tree.
Please take this stuff via the bluetooth/wireless trees to avoid the
conflicts, thanks.
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.
If you want I can also take the net/6lowpan stuff through bluetooth-next tree.
Regards
Marcel
Hi Marcel,
On Fri, Jul 11, 2014 at 01:23:52PM +0200, Marcel Holtmann wrote:
> 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.
- Alex
Hi Alexander,
> This patch add a maintainer entry for "net/6lowpan". Also add the current
> IEEE 802.15.4 mailing list and bluetooth mailinglist to this branch,
> because this code is shared between them.
>
> Signed-off-by: Alexander Aring <[email protected]>
> ---
> MAINTAINERS | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 5eede71..acad051 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -148,6 +148,13 @@ L: [email protected]
> S: Maintained
> F: drivers/scsi/53c700*
>
> +6LOWPAN GENERIC (BTLE/IEEE 802.15.4)
> +M: Alexander Aring <[email protected]>
> +L: [email protected] (moderated for non-subscribers)
> +L: [email protected]
> +S: Maintained
> +F: net/6lowpan/
> +
Acked-by: Marcel Holtmann <[email protected]>
Regards
Marcel
Hi Alexander,
> This patch moves generic code which is used by bluetooth and ieee802154
> 6lowpan to a new net/6lowpan directory. This directory contains generic
> 6LoWPAN code which is shared between bluetooth and ieee802154 MAC-Layer.
>
> This is the IPHC - "IPv6 Header Compression" format at the moment. Which
> is described by RFC 6282 [0]. The BLTE 6LoWPAN draft describes that the
> IPHC is the same format like IEEE 802.15.4, see [1].
>
> Futuremore we can put more code into this directory which is shared
> between BLTE and IEEE 802.15.4 6LoWPAN like RFC 6775 or the routing
> protocol RPL RFC 6550.
>
> To avoid naming conflicts I renamed 6lowpan-y to ieee802154_6lowpan-y
> in net/ieee802154/Makefile.
>
> [0] http://tools.ietf.org/html/rfc6282
> [1] http://tools.ietf.org/html/draft-ietf-6lowpan-btle-12#section-3.2
> [2] http://tools.ietf.org/html/rfc6775
> [3] http://tools.ietf.org/html/rfc6550
>
> Signed-off-by: Alexander Aring <[email protected]>
> ---
> net/6lowpan/Kconfig | 6 ++++++
> net/6lowpan/Makefile | 3 +++
> net/{ieee802154/6lowpan_iphc.c => 6lowpan/iphc.c} | 0
> net/Kconfig | 1 +
> net/Makefile | 3 ++-
> net/bluetooth/Kconfig | 3 +--
> net/ieee802154/Kconfig | 9 +--------
> net/ieee802154/Makefile | 5 ++---
> 8 files changed, 16 insertions(+), 14 deletions(-)
> create mode 100644 net/6lowpan/Kconfig
> create mode 100644 net/6lowpan/Makefile
> rename net/{ieee802154/6lowpan_iphc.c => 6lowpan/iphc.c} (100%)
>
> diff --git a/net/6lowpan/Kconfig b/net/6lowpan/Kconfig
> new file mode 100644
> index 0000000..028a5c6
> --- /dev/null
> +++ b/net/6lowpan/Kconfig
> @@ -0,0 +1,6 @@
> +config 6LOWPAN
> + bool "6LoWPAN Support"
> + depends on IPV6
> + ---help---
> + This enables IPv6 over Low power Wireless Personal Area Network -
> + "6LoWPAN" which is supported by IEEE 802.15.4 or Bluetooth stacks.
> diff --git a/net/6lowpan/Makefile b/net/6lowpan/Makefile
> new file mode 100644
> index 0000000..415886b
> --- /dev/null
> +++ b/net/6lowpan/Makefile
> @@ -0,0 +1,3 @@
> +obj-$(CONFIG_6LOWPAN) := 6lowpan.o
> +
> +6lowpan-y := iphc.o
> diff --git a/net/ieee802154/6lowpan_iphc.c b/net/6lowpan/iphc.c
> similarity index 100%
> rename from net/ieee802154/6lowpan_iphc.c
> rename to net/6lowpan/iphc.c
> diff --git a/net/Kconfig b/net/Kconfig
> index d92afe4..4051fdf 100644
> --- a/net/Kconfig
> +++ b/net/Kconfig
> @@ -214,6 +214,7 @@ source "drivers/net/appletalk/Kconfig"
> source "net/x25/Kconfig"
> source "net/lapb/Kconfig"
> source "net/phonet/Kconfig"
> +source "net/6lowpan/Kconfig"
> source "net/ieee802154/Kconfig"
> source "net/mac802154/Kconfig"
> source "net/sched/Kconfig"
> diff --git a/net/Makefile b/net/Makefile
> 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.
Dave, can we take this through bluetooth-next and wireless-next trees?
Regards
Marcel
Hi Alex,
On pe, 2014-07-11 at 10:24 +0200, Alexander Aring wrote:
> Hi,
>
> this patch series add a new branch "net/6lowpan" for generic 6LoWPAN code.
>
> Since commit 8df8c56a5abc70af5862aa7cac2875aeeb17a42b ("6lowpan: Moving
> generic compression code into 6lowpan_iphc.c") the IPHC compression is shared
> between bluetooth 6LoWPAN and IEEE 802.15.4 6LoWPAN. The new 6LoWPAN directory
> will contain generic code for 6LoWPAN and futhermore 6LoWPAN upper layer
> protocols.
>
> The shared code between bluetooth and 802.15.4 should be review from both
> communities. The current behaviour is that get_maintainers.pl returns the
> IEEE 802.15.4 community only.
>
>
> I request a new mailinglist for the IEEE 802.15.4 subsystem at vger but I didn't
> get a response now so I add the current sourceforge IEEE 802.15.4 mailinglist to
> the MAINTAINERS file. I will update them soon.
This is great idea.
Acked-by: Jukka Rissanen <[email protected]>
On 07/11/2014 01:54 PM, Alexander Aring wrote:
> Hi,
>
> this patch series add a new branch "net/6lowpan" for generic 6LoWPAN code.
>
> Since commit 8df8c56a5abc70af5862aa7cac2875aeeb17a42b ("6lowpan: Moving
> generic compression code into 6lowpan_iphc.c") the IPHC compression is shared
> between bluetooth 6LoWPAN and IEEE 802.15.4 6LoWPAN. The new 6LoWPAN directory
> will contain generic code for 6LoWPAN and futhermore 6LoWPAN upper layer
> protocols.
>
> The shared code between bluetooth and 802.15.4 should be review from both
> communities. The current behaviour is that get_maintainers.pl returns the
> IEEE 802.15.4 community only.
>
>
> I request a new mailinglist for the IEEE 802.15.4 subsystem at vger but I didn't
> get a response now so I add the current sourceforge IEEE 802.15.4 mailinglist to
> the MAINTAINERS file. I will update them soon.
>
> - Alex
>
> Alexander Aring (2):
> 6lowpan: introduce new net/6lowpan directory
> MAINTAINERS: add net/6lowpan/ maintainer entry
>
> MAINTAINERS | 7 +++++++
> net/6lowpan/Kconfig | 6 ++++++
> net/6lowpan/Makefile | 3 +++
> net/{ieee802154/6lowpan_iphc.c => 6lowpan/iphc.c} | 0
> net/Kconfig | 1 +
> net/Makefile | 3 ++-
> net/bluetooth/Kconfig | 3 +--
> net/ieee802154/Kconfig | 9 +--------
> net/ieee802154/Makefile | 5 ++---
> 9 files changed, 23 insertions(+), 14 deletions(-)
> create mode 100644 net/6lowpan/Kconfig
> create mode 100644 net/6lowpan/Makefile
> rename net/{ieee802154/6lowpan_iphc.c => 6lowpan/iphc.c} (100%)
>
Tested-by: Varka Bhadram <[email protected]>
--
Regards,
Varka Bhadram.
This patch add a maintainer entry for "net/6lowpan". Also add the current
IEEE 802.15.4 mailing list and bluetooth mailinglist to this branch,
because this code is shared between them.
Signed-off-by: Alexander Aring <[email protected]>
---
MAINTAINERS | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index 5eede71..acad051 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -148,6 +148,13 @@ L: [email protected]
S: Maintained
F: drivers/scsi/53c700*
+6LOWPAN GENERIC (BTLE/IEEE 802.15.4)
+M: Alexander Aring <[email protected]>
+L: [email protected] (moderated for non-subscribers)
+L: [email protected]
+S: Maintained
+F: net/6lowpan/
+
6PACK NETWORK DRIVER FOR AX.25
M: Andreas Koensgen <[email protected]>
L: [email protected]
--
2.0.1
This patch moves generic code which is used by bluetooth and ieee802154
6lowpan to a new net/6lowpan directory. This directory contains generic
6LoWPAN code which is shared between bluetooth and ieee802154 MAC-Layer.
This is the IPHC - "IPv6 Header Compression" format at the moment. Which
is described by RFC 6282 [0]. The BLTE 6LoWPAN draft describes that the
IPHC is the same format like IEEE 802.15.4, see [1].
Futuremore we can put more code into this directory which is shared
between BLTE and IEEE 802.15.4 6LoWPAN like RFC 6775 or the routing
protocol RPL RFC 6550.
To avoid naming conflicts I renamed 6lowpan-y to ieee802154_6lowpan-y
in net/ieee802154/Makefile.
[0] http://tools.ietf.org/html/rfc6282
[1] http://tools.ietf.org/html/draft-ietf-6lowpan-btle-12#section-3.2
[2] http://tools.ietf.org/html/rfc6775
[3] http://tools.ietf.org/html/rfc6550
Signed-off-by: Alexander Aring <[email protected]>
---
net/6lowpan/Kconfig | 6 ++++++
net/6lowpan/Makefile | 3 +++
net/{ieee802154/6lowpan_iphc.c => 6lowpan/iphc.c} | 0
net/Kconfig | 1 +
net/Makefile | 3 ++-
net/bluetooth/Kconfig | 3 +--
net/ieee802154/Kconfig | 9 +--------
net/ieee802154/Makefile | 5 ++---
8 files changed, 16 insertions(+), 14 deletions(-)
create mode 100644 net/6lowpan/Kconfig
create mode 100644 net/6lowpan/Makefile
rename net/{ieee802154/6lowpan_iphc.c => 6lowpan/iphc.c} (100%)
diff --git a/net/6lowpan/Kconfig b/net/6lowpan/Kconfig
new file mode 100644
index 0000000..028a5c6
--- /dev/null
+++ b/net/6lowpan/Kconfig
@@ -0,0 +1,6 @@
+config 6LOWPAN
+ bool "6LoWPAN Support"
+ depends on IPV6
+ ---help---
+ This enables IPv6 over Low power Wireless Personal Area Network -
+ "6LoWPAN" which is supported by IEEE 802.15.4 or Bluetooth stacks.
diff --git a/net/6lowpan/Makefile b/net/6lowpan/Makefile
new file mode 100644
index 0000000..415886b
--- /dev/null
+++ b/net/6lowpan/Makefile
@@ -0,0 +1,3 @@
+obj-$(CONFIG_6LOWPAN) := 6lowpan.o
+
+6lowpan-y := iphc.o
diff --git a/net/ieee802154/6lowpan_iphc.c b/net/6lowpan/iphc.c
similarity index 100%
rename from net/ieee802154/6lowpan_iphc.c
rename to net/6lowpan/iphc.c
diff --git a/net/Kconfig b/net/Kconfig
index d92afe4..4051fdf 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -214,6 +214,7 @@ source "drivers/net/appletalk/Kconfig"
source "net/x25/Kconfig"
source "net/lapb/Kconfig"
source "net/phonet/Kconfig"
+source "net/6lowpan/Kconfig"
source "net/ieee802154/Kconfig"
source "net/mac802154/Kconfig"
source "net/sched/Kconfig"
diff --git a/net/Makefile b/net/Makefile
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.
diff --git a/net/ieee802154/Kconfig b/net/ieee802154/Kconfig
index 8af1330..c0d4154 100644
--- a/net/ieee802154/Kconfig
+++ b/net/ieee802154/Kconfig
@@ -12,13 +12,6 @@ config IEEE802154
config IEEE802154_6LOWPAN
tristate "6lowpan support over IEEE 802.15.4"
- depends on IEEE802154 && IPV6
- select 6LOWPAN_IPHC
+ depends on IEEE802154 && 6LOWPAN
---help---
IPv6 compression over IEEE 802.15.4.
-
-config 6LOWPAN_IPHC
- tristate
- ---help---
- 6lowpan compression code which is shared between IEEE 802.15.4 and Bluetooth
- stacks.
diff --git a/net/ieee802154/Makefile b/net/ieee802154/Makefile
index bf1b514..3914b1e 100644
--- a/net/ieee802154/Makefile
+++ b/net/ieee802154/Makefile
@@ -1,8 +1,7 @@
obj-$(CONFIG_IEEE802154) += ieee802154.o af_802154.o
-obj-$(CONFIG_IEEE802154_6LOWPAN) += 6lowpan.o
-obj-$(CONFIG_6LOWPAN_IPHC) += 6lowpan_iphc.o
+obj-$(CONFIG_IEEE802154_6LOWPAN) += ieee802154_6lowpan.o
-6lowpan-y := 6lowpan_rtnl.o reassembly.o
+ieee802154_6lowpan-y := 6lowpan_rtnl.o reassembly.o
ieee802154-y := netlink.o nl-mac.o nl-phy.o nl_policy.o wpan-class.o \
header_ops.o
af_802154-y := af_ieee802154.o raw.o dgram.o
--
2.0.1