From 59e55c354cde413be7f37e8c1045eb931362ae7e Mon Sep 17 00:00:00 2001
From: Oleg Hahm <oleg@hobbykeller.org>
Date: Sun, 15 Dec 2013 16:03:33 +0100
Subject: [PATCH] moved sixlowpan into network_layer subfolder

---
 sys/Makefile                                            | 2 +-
 sys/net/include/ipv6.h                                  | 2 +-
 sys/net/{ => network_layer}/sixlowpan/Makefile          | 0
 sys/net/{ => network_layer}/sixlowpan/border.c          | 0
 sys/net/{ => network_layer}/sixlowpan/border.h          | 0
 sys/net/{ => network_layer}/sixlowpan/bordermultiplex.c | 0
 sys/net/{ => network_layer}/sixlowpan/bordermultiplex.h | 0
 sys/net/{ => network_layer}/sixlowpan/flowcontrol.c     | 0
 sys/net/{ => network_layer}/sixlowpan/flowcontrol.h     | 0
 sys/net/{ => network_layer}/sixlowpan/icmp.c            | 0
 sys/net/{ => network_layer}/sixlowpan/icmp.h            | 0
 sys/net/{ => network_layer}/sixlowpan/ip.c              | 0
 sys/net/{ => network_layer}/sixlowpan/ip.h              | 0
 sys/net/{ => network_layer}/sixlowpan/lowpan.c          | 0
 sys/net/{ => network_layer}/sixlowpan/lowpan.h          | 0
 sys/net/{ => network_layer}/sixlowpan/mac.c             | 0
 sys/net/{ => network_layer}/sixlowpan/serialnumber.c    | 0
 sys/net/{ => network_layer}/sixlowpan/serialnumber.h    | 0
 18 files changed, 2 insertions(+), 2 deletions(-)
 rename sys/net/{ => network_layer}/sixlowpan/Makefile (100%)
 rename sys/net/{ => network_layer}/sixlowpan/border.c (100%)
 rename sys/net/{ => network_layer}/sixlowpan/border.h (100%)
 rename sys/net/{ => network_layer}/sixlowpan/bordermultiplex.c (100%)
 rename sys/net/{ => network_layer}/sixlowpan/bordermultiplex.h (100%)
 rename sys/net/{ => network_layer}/sixlowpan/flowcontrol.c (100%)
 rename sys/net/{ => network_layer}/sixlowpan/flowcontrol.h (100%)
 rename sys/net/{ => network_layer}/sixlowpan/icmp.c (100%)
 rename sys/net/{ => network_layer}/sixlowpan/icmp.h (100%)
 rename sys/net/{ => network_layer}/sixlowpan/ip.c (100%)
 rename sys/net/{ => network_layer}/sixlowpan/ip.h (100%)
 rename sys/net/{ => network_layer}/sixlowpan/lowpan.c (100%)
 rename sys/net/{ => network_layer}/sixlowpan/lowpan.h (100%)
 rename sys/net/{ => network_layer}/sixlowpan/mac.c (100%)
 rename sys/net/{ => network_layer}/sixlowpan/serialnumber.c (100%)
 rename sys/net/{ => network_layer}/sixlowpan/serialnumber.h (100%)

diff --git a/sys/Makefile b/sys/Makefile
index 216161d382..46861adaa6 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -65,7 +65,7 @@ ifneq (,$(findstring protocol_multiplex,$(USEMODULE)))
     DIRS += net/link_layer/protocol-multiplex
 endif
 ifneq (,$(findstring sixlowpan,$(USEMODULE)))
-    DIRS += net/sixlowpan
+    DIRS += net/network_layer/sixlowpan
 endif
 ifneq (,$(findstring rpl,$(USEMODULE)))
     DIRS += net/routing/rpl
diff --git a/sys/net/include/ipv6.h b/sys/net/include/ipv6.h
index e17fc2d8f2..9d5eabd494 100644
--- a/sys/net/include/ipv6.h
+++ b/sys/net/include/ipv6.h
@@ -23,7 +23,7 @@
 #include "sixlowpan/icmp.h"
 #include "sixlowpan/ndp.h"
 
-#include "../sixlowpan/icmp.h"        /* TODO: remove if not needed anymore */
+#include "../network_layer/sixlowpan/icmp.h"        /* TODO: remove if not needed anymore */
 
 /**
  * @}
diff --git a/sys/net/sixlowpan/Makefile b/sys/net/network_layer/sixlowpan/Makefile
similarity index 100%
rename from sys/net/sixlowpan/Makefile
rename to sys/net/network_layer/sixlowpan/Makefile
diff --git a/sys/net/sixlowpan/border.c b/sys/net/network_layer/sixlowpan/border.c
similarity index 100%
rename from sys/net/sixlowpan/border.c
rename to sys/net/network_layer/sixlowpan/border.c
diff --git a/sys/net/sixlowpan/border.h b/sys/net/network_layer/sixlowpan/border.h
similarity index 100%
rename from sys/net/sixlowpan/border.h
rename to sys/net/network_layer/sixlowpan/border.h
diff --git a/sys/net/sixlowpan/bordermultiplex.c b/sys/net/network_layer/sixlowpan/bordermultiplex.c
similarity index 100%
rename from sys/net/sixlowpan/bordermultiplex.c
rename to sys/net/network_layer/sixlowpan/bordermultiplex.c
diff --git a/sys/net/sixlowpan/bordermultiplex.h b/sys/net/network_layer/sixlowpan/bordermultiplex.h
similarity index 100%
rename from sys/net/sixlowpan/bordermultiplex.h
rename to sys/net/network_layer/sixlowpan/bordermultiplex.h
diff --git a/sys/net/sixlowpan/flowcontrol.c b/sys/net/network_layer/sixlowpan/flowcontrol.c
similarity index 100%
rename from sys/net/sixlowpan/flowcontrol.c
rename to sys/net/network_layer/sixlowpan/flowcontrol.c
diff --git a/sys/net/sixlowpan/flowcontrol.h b/sys/net/network_layer/sixlowpan/flowcontrol.h
similarity index 100%
rename from sys/net/sixlowpan/flowcontrol.h
rename to sys/net/network_layer/sixlowpan/flowcontrol.h
diff --git a/sys/net/sixlowpan/icmp.c b/sys/net/network_layer/sixlowpan/icmp.c
similarity index 100%
rename from sys/net/sixlowpan/icmp.c
rename to sys/net/network_layer/sixlowpan/icmp.c
diff --git a/sys/net/sixlowpan/icmp.h b/sys/net/network_layer/sixlowpan/icmp.h
similarity index 100%
rename from sys/net/sixlowpan/icmp.h
rename to sys/net/network_layer/sixlowpan/icmp.h
diff --git a/sys/net/sixlowpan/ip.c b/sys/net/network_layer/sixlowpan/ip.c
similarity index 100%
rename from sys/net/sixlowpan/ip.c
rename to sys/net/network_layer/sixlowpan/ip.c
diff --git a/sys/net/sixlowpan/ip.h b/sys/net/network_layer/sixlowpan/ip.h
similarity index 100%
rename from sys/net/sixlowpan/ip.h
rename to sys/net/network_layer/sixlowpan/ip.h
diff --git a/sys/net/sixlowpan/lowpan.c b/sys/net/network_layer/sixlowpan/lowpan.c
similarity index 100%
rename from sys/net/sixlowpan/lowpan.c
rename to sys/net/network_layer/sixlowpan/lowpan.c
diff --git a/sys/net/sixlowpan/lowpan.h b/sys/net/network_layer/sixlowpan/lowpan.h
similarity index 100%
rename from sys/net/sixlowpan/lowpan.h
rename to sys/net/network_layer/sixlowpan/lowpan.h
diff --git a/sys/net/sixlowpan/mac.c b/sys/net/network_layer/sixlowpan/mac.c
similarity index 100%
rename from sys/net/sixlowpan/mac.c
rename to sys/net/network_layer/sixlowpan/mac.c
diff --git a/sys/net/sixlowpan/serialnumber.c b/sys/net/network_layer/sixlowpan/serialnumber.c
similarity index 100%
rename from sys/net/sixlowpan/serialnumber.c
rename to sys/net/network_layer/sixlowpan/serialnumber.c
diff --git a/sys/net/sixlowpan/serialnumber.h b/sys/net/network_layer/sixlowpan/serialnumber.h
similarity index 100%
rename from sys/net/sixlowpan/serialnumber.h
rename to sys/net/network_layer/sixlowpan/serialnumber.h
-- 
GitLab