summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/ieee802154/6lowpan/6lowpan_rtnl.c (renamed from net/ieee802154/6lowpan_rtnl.c)0
-rw-r--r--net/ieee802154/6lowpan/Kconfig5
-rw-r--r--net/ieee802154/6lowpan/Makefile3
-rw-r--r--net/ieee802154/6lowpan/reassembly.c (renamed from net/ieee802154/reassembly.c)0
-rw-r--r--net/ieee802154/6lowpan/reassembly.h (renamed from net/ieee802154/reassembly.h)0
-rw-r--r--net/ieee802154/Kconfig6
-rw-r--r--net/ieee802154/Makefile3
7 files changed, 10 insertions, 7 deletions
diff --git a/net/ieee802154/6lowpan_rtnl.c b/net/ieee802154/6lowpan/6lowpan_rtnl.c
index 27eaa65e88e1..27eaa65e88e1 100644
--- a/net/ieee802154/6lowpan_rtnl.c
+++ b/net/ieee802154/6lowpan/6lowpan_rtnl.c
diff --git a/net/ieee802154/6lowpan/Kconfig b/net/ieee802154/6lowpan/Kconfig
new file mode 100644
index 000000000000..d24f985b0bfd
--- /dev/null
+++ b/net/ieee802154/6lowpan/Kconfig
@@ -0,0 +1,5 @@
1config IEEE802154_6LOWPAN
2 tristate "6lowpan support over IEEE 802.15.4"
3 depends on 6LOWPAN
4 ---help---
5 IPv6 compression over IEEE 802.15.4.
diff --git a/net/ieee802154/6lowpan/Makefile b/net/ieee802154/6lowpan/Makefile
new file mode 100644
index 000000000000..936959bd4f99
--- /dev/null
+++ b/net/ieee802154/6lowpan/Makefile
@@ -0,0 +1,3 @@
1obj-y += ieee802154_6lowpan.o
2
3ieee802154_6lowpan-y := 6lowpan_rtnl.o reassembly.o
diff --git a/net/ieee802154/reassembly.c b/net/ieee802154/6lowpan/reassembly.c
index 9d980ed3ffe2..9d980ed3ffe2 100644
--- a/net/ieee802154/reassembly.c
+++ b/net/ieee802154/6lowpan/reassembly.c
diff --git a/net/ieee802154/reassembly.h b/net/ieee802154/6lowpan/reassembly.h
index 836b16fa001f..836b16fa001f 100644
--- a/net/ieee802154/reassembly.h
+++ b/net/ieee802154/6lowpan/reassembly.h
diff --git a/net/ieee802154/Kconfig b/net/ieee802154/Kconfig
index 9ea0af49a4ea..1370d5b0041b 100644
--- a/net/ieee802154/Kconfig
+++ b/net/ieee802154/Kconfig
@@ -20,10 +20,6 @@ config IEEE802154_SOCKET
20 for 802.15.4 dataframes. Also RAW socket interface to build MAC 20 for 802.15.4 dataframes. Also RAW socket interface to build MAC
21 header from userspace. 21 header from userspace.
22 22
23config IEEE802154_6LOWPAN 23source "net/ieee802154/6lowpan/Kconfig"
24 tristate "6lowpan support over IEEE 802.15.4"
25 depends on 6LOWPAN
26 ---help---
27 IPv6 compression over IEEE 802.15.4.
28 24
29endif 25endif
diff --git a/net/ieee802154/Makefile b/net/ieee802154/Makefile
index 88bde78754c5..36533978b5ef 100644
--- a/net/ieee802154/Makefile
+++ b/net/ieee802154/Makefile
@@ -1,8 +1,7 @@
1obj-$(CONFIG_IEEE802154) += ieee802154.o 1obj-$(CONFIG_IEEE802154) += ieee802154.o
2obj-$(CONFIG_IEEE802154_SOCKET) += ieee802154_socket.o 2obj-$(CONFIG_IEEE802154_SOCKET) += ieee802154_socket.o
3obj-$(CONFIG_IEEE802154_6LOWPAN) += ieee802154_6lowpan.o 3obj-$(CONFIG_IEEE802154_6LOWPAN) += 6lowpan/
4 4
5ieee802154_6lowpan-y := 6lowpan_rtnl.o reassembly.o
6ieee802154-y := netlink.o nl-mac.o nl-phy.o nl_policy.o core.o \ 5ieee802154-y := netlink.o nl-mac.o nl-phy.o nl_policy.o core.o \
7 header_ops.o sysfs.o nl802154.o 6 header_ops.o sysfs.o nl802154.o
8ieee802154_socket-y := socket.o 7ieee802154_socket-y := socket.o