Reverted changes to examples/multicast

examples/multicast/Makefile

@@ -12,11 +12,6 @@ include $(CONTIKI)/Makefile.identify-target
 MODULES_REL += $(TARGET)
 
 MODULES += os/net/ipv6/multicast
-MODULES += os/services/shell
-
-ifeq ($(DISABLE_AUTO_ROOT),1)
-	CFLAGS += -DDISABLE_AUTO_ROOT
-endif
 
 MAKE_ROUTING = MAKE_ROUTING_RPL_CLASSIC
 include $(CONTIKI)/Makefile.include

examples/multicast/root.c

@@ -111,9 +111,9 @@ PROCESS_THREAD(rpl_root_process, ev, data)
   PROCESS_BEGIN();
 
   PRINTF("Multicast Engine: '%s'\n", UIP_MCAST6.name);
-#ifndef DISABLE_AUTO_ROOT
+
   NETSTACK_ROUTING.root_start();
-#endif
+
   prepare_mcast();
 
   etimer_set(&et, START_DELAY * CLOCK_SECOND);