Commit 2c6bed7c authored by Alexander Aring's avatar Alexander Aring Committed by Marcel Holtmann

6lowpan: introduce new net/6lowpan directory

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/rfc6550Signed-off-by: default avatarAlexander Aring <alex.aring@gmail.com>
Acked-by: default avatarJukka Rissanen <jukka.rissanen@linux.intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 6c53823a
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.
obj-$(CONFIG_6LOWPAN) := 6lowpan.o
6lowpan-y := iphc.o
...@@ -214,6 +214,7 @@ source "drivers/net/appletalk/Kconfig" ...@@ -214,6 +214,7 @@ source "drivers/net/appletalk/Kconfig"
source "net/x25/Kconfig" source "net/x25/Kconfig"
source "net/lapb/Kconfig" source "net/lapb/Kconfig"
source "net/phonet/Kconfig" source "net/phonet/Kconfig"
source "net/6lowpan/Kconfig"
source "net/ieee802154/Kconfig" source "net/ieee802154/Kconfig"
source "net/mac802154/Kconfig" source "net/mac802154/Kconfig"
source "net/sched/Kconfig" source "net/sched/Kconfig"
......
...@@ -57,7 +57,8 @@ obj-$(CONFIG_CAIF) += caif/ ...@@ -57,7 +57,8 @@ obj-$(CONFIG_CAIF) += caif/
ifneq ($(CONFIG_DCB),) ifneq ($(CONFIG_DCB),)
obj-y += dcb/ obj-y += dcb/
endif endif
obj-y += ieee802154/ obj-$(CONFIG_6LOWPAN) += 6lowpan/
obj-$(CONFIG_IEEE802154) += ieee802154/
obj-$(CONFIG_MAC802154) += mac802154/ obj-$(CONFIG_MAC802154) += mac802154/
ifeq ($(CONFIG_NET),y) ifeq ($(CONFIG_NET),y)
......
...@@ -41,8 +41,7 @@ menuconfig BT ...@@ -41,8 +41,7 @@ menuconfig BT
config BT_6LOWPAN config BT_6LOWPAN
tristate "Bluetooth 6LoWPAN support" tristate "Bluetooth 6LoWPAN support"
depends on BT && IPV6 depends on BT && 6LOWPAN
select 6LOWPAN_IPHC if BT_6LOWPAN
help help
IPv6 compression over Bluetooth Low Energy. IPv6 compression over Bluetooth Low Energy.
......
...@@ -12,13 +12,6 @@ config IEEE802154 ...@@ -12,13 +12,6 @@ config IEEE802154
config IEEE802154_6LOWPAN config IEEE802154_6LOWPAN
tristate "6lowpan support over IEEE 802.15.4" tristate "6lowpan support over IEEE 802.15.4"
depends on IEEE802154 && IPV6 depends on IEEE802154 && 6LOWPAN
select 6LOWPAN_IPHC
---help--- ---help---
IPv6 compression over IEEE 802.15.4. 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.
obj-$(CONFIG_IEEE802154) += ieee802154.o af_802154.o obj-$(CONFIG_IEEE802154) += ieee802154.o af_802154.o
obj-$(CONFIG_IEEE802154_6LOWPAN) += 6lowpan.o obj-$(CONFIG_IEEE802154_6LOWPAN) += ieee802154_6lowpan.o
obj-$(CONFIG_6LOWPAN_IPHC) += 6lowpan_iphc.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 \ ieee802154-y := netlink.o nl-mac.o nl-phy.o nl_policy.o wpan-class.o \
header_ops.o header_ops.o
af_802154-y := af_ieee802154.o raw.o dgram.o af_802154-y := af_ieee802154.o raw.o dgram.o
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment