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

Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Acked-by: Jukka Rissanen <jukka.rissanen@linux.intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/net/6lowpan/Kconfig b/net/6lowpan/Kconfig
new file mode 100644 (file)
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 (file)
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 d92afe4204d9c4f55be1017abde876f90c54fde9..4051fdfa43677ccf7142244c97e2e383515e77e8 100644 (file)
--- 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 cbbbe6d657caf15e670c46b8999872bf360ac801..7ed1970074b07bfcf0803f468f62efba7a9018ac 100644 (file)
--- 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 f5afaa22f6ecda644d31551cb32d7a3758de31a3..600fb29288f47c48ce17583d769d502746854bd1 100644 (file)
--- a/net/bluetooth/Kconfig
+++ b/net/bluetooth/Kconfig
@@ -41,8 +41,7 @@ menuconfig BT
 
 config BT_6LOWPAN
        tristate "Bluetooth 6LoWPAN support"
-       depends on BT && IPV6
-       select 6LOWPAN_IPHC if BT_6LOWPAN
+       depends on BT && 6LOWPAN
        help
          IPv6 compression over Bluetooth Low Energy.
 

diff --git a/net/ieee802154/Kconfig b/net/ieee802154/Kconfig
index 8af1330b3137b0282d316190770d77150f336d56..c0d4154d144f1eeac5418a048a0ccded798c3419 100644 (file)
--- 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 bf1b51497a41048442640cf02d8de1f62c18ef6a..3914b1ed42743c50aaa4fe0a40927133cf25dae1 100644 (file)
--- 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