ETX-functionality is now part of a common routing-module

Makefile.dep

@@ -34,6 +34,14 @@ ifneq (,$(filter sixlowborder,$(USEMODULE)))
     endif
 endif
 
+ifneq (,$(filter rpl,$(USEMODULE)))
+    USEMODULE += routing
+endif
+
+ifneq (,$(filter routing,$(USEMODULE)))
+    USEMODULE += sixlowpan
+endif
+
 ifneq (,$(filter sixlowpan,$(USEMODULE)))
     ifeq (,$(filter ieee802154,$(USEMODULE)))
         USEMODULE += ieee802154

examples/rpl_udp/Makefile

@@ -54,7 +54,6 @@ USEMODULE += posix
 USEMODULE += ps
 USEMODULE += vtimer
 USEMODULE += defaulttransceiver
-USEMODULE += sixlowpan
 USEMODULE += rpl
 USEMODULE += destiny
 

sys/Makefile

@@ -62,6 +62,9 @@ endif
 ifneq (,$(filter rpl,$(USEMODULE)))
     DIRS += net/routing/rpl
 endif
+ifneq (,$(filter routing,$(USEMODULE)))
+	DIRS += net/routing
+endif
 ifneq (,$(filter ieee802154,$(USEMODULE)))
     DIRS += net/link_layer/ieee802154
 endif

sys/net/routing/Makefile

+MODULE:=$(shell basename $(CURDIR))
+
+include $(RIOTBASE)/Makefile.base

sys/net/routing/rpl/etx_beaconing.c → sys/net/routing/etx_beaconing.c

@@ -101,7 +101,6 @@ transceiver_command_t tcmd;
 //Message to send probes with
 msg_t mesg;
 
-//RPL-address
 static ipv6_addr_t *own_address;
 
 static etx_probe_t *etx_get_send_buf(void)
@@ -113,7 +112,7 @@ static etx_probe_t *etx_get_rec_buf(void)
     return ((etx_probe_t *) &(etx_rec_buf[0]));
 }
 
-void show_candidates(void)
+void etx_show_candidates(void)
 {
     etx_neighbor_t *candidate;
     etx_neighbor_t *end;

sys/net/routing/rpl/rpl.c

@@ -209,7 +209,7 @@ uint8_t rpl_init(int if_id)
 
     /* INSERT NEW OBJECTIVE FUNCTIONS HERE */
     objective_functions[0] = rpl_get_of0();
-    /* objective_functions[1] = rpl_get_of_ETX() */
+    objective_functions[1] = rpl_get_of_mrhof();
 
     sixlowpan_lowpan_init_interface(if_id);
     /* need link local prefix to query _our_ corresponding address  */