diff --git a/sys/Makefile b/sys/Makefile index 6c82267cd2a1ab5f7d09485f4fdd18b7b691b3f6..d0f2362953d51ba808eb897efa4481f6b14e83bf 100644 --- a/sys/Makefile +++ b/sys/Makefile @@ -77,7 +77,7 @@ ifneq (,$(findstring sixlowpan,$(USEMODULE))) DIRS += net/sixlowpan endif ifneq (,$(findstring rpl,$(USEMODULE))) - DIRS += net/sixlowpan/rpl + DIRS += net/rpl endif ifneq (,$(findstring ieee802154,$(USEMODULE))) DIRS += net/ieee802154 diff --git a/sys/net/sixlowpan/rpl/Makefile b/sys/net/rpl/Makefile similarity index 100% rename from sys/net/sixlowpan/rpl/Makefile rename to sys/net/rpl/Makefile diff --git a/sys/net/sixlowpan/rpl/etx_beaconing.c b/sys/net/rpl/etx_beaconing.c similarity index 100% rename from sys/net/sixlowpan/rpl/etx_beaconing.c rename to sys/net/rpl/etx_beaconing.c diff --git a/sys/net/sixlowpan/rpl/etx_beaconing.h b/sys/net/rpl/etx_beaconing.h similarity index 100% rename from sys/net/sixlowpan/rpl/etx_beaconing.h rename to sys/net/rpl/etx_beaconing.h diff --git a/sys/net/sixlowpan/rpl/of0.c b/sys/net/rpl/of0.c similarity index 100% rename from sys/net/sixlowpan/rpl/of0.c rename to sys/net/rpl/of0.c diff --git a/sys/net/sixlowpan/rpl/of0.h b/sys/net/rpl/of0.h similarity index 100% rename from sys/net/sixlowpan/rpl/of0.h rename to sys/net/rpl/of0.h diff --git a/sys/net/sixlowpan/rpl/of_mrhof.c b/sys/net/rpl/of_mrhof.c similarity index 100% rename from sys/net/sixlowpan/rpl/of_mrhof.c rename to sys/net/rpl/of_mrhof.c diff --git a/sys/net/sixlowpan/rpl/of_mrhof.h b/sys/net/rpl/of_mrhof.h similarity index 100% rename from sys/net/sixlowpan/rpl/of_mrhof.h rename to sys/net/rpl/of_mrhof.h diff --git a/sys/net/sixlowpan/rpl/rpl.c b/sys/net/rpl/rpl.c similarity index 100% rename from sys/net/sixlowpan/rpl/rpl.c rename to sys/net/rpl/rpl.c diff --git a/sys/net/sixlowpan/rpl/rpl.h b/sys/net/rpl/rpl.h similarity index 100% rename from sys/net/sixlowpan/rpl/rpl.h rename to sys/net/rpl/rpl.h diff --git a/sys/net/sixlowpan/rpl/rpl_dodag.c b/sys/net/rpl/rpl_dodag.c similarity index 100% rename from sys/net/sixlowpan/rpl/rpl_dodag.c rename to sys/net/rpl/rpl_dodag.c diff --git a/sys/net/sixlowpan/rpl/rpl_dodag.h b/sys/net/rpl/rpl_dodag.h similarity index 100% rename from sys/net/sixlowpan/rpl/rpl_dodag.h rename to sys/net/rpl/rpl_dodag.h diff --git a/sys/net/sixlowpan/rpl/rpl_structs.h b/sys/net/rpl/rpl_structs.h similarity index 100% rename from sys/net/sixlowpan/rpl/rpl_structs.h rename to sys/net/rpl/rpl_structs.h diff --git a/sys/net/sixlowpan/rpl/trickle.c b/sys/net/rpl/trickle.c similarity index 99% rename from sys/net/sixlowpan/rpl/trickle.c rename to sys/net/rpl/trickle.c index f74c1fec650c291334141da8e861555292e8a389..69473445abc1cb8ed404bc39c83c137ec1cd8972 100644 --- a/sys/net/sixlowpan/rpl/trickle.c +++ b/sys/net/rpl/trickle.c @@ -22,7 +22,7 @@ #include <math.h> #include "inttypes.h" #include "trickle.h" -#include "sixlowpan/rpl/rpl.h" +#include "rpl/rpl.h" //TODO in pointer umwandeln, speicher mit malloc holen char * timer_over_buf; diff --git a/sys/net/sixlowpan/rpl/trickle.h b/sys/net/rpl/trickle.h similarity index 100% rename from sys/net/sixlowpan/rpl/trickle.h rename to sys/net/rpl/trickle.h