Remove now unneeded UIP_CONF_IPV6 guards in net/ipv6 and net/rpl code

core/net/ipv6/multicast/roll-tm.c

@@ -67,7 +67,6 @@
 #define VERBOSE_PRINT_SEED(...)
 #endif
 
-#if UIP_CONF_IPV6
 /*---------------------------------------------------------------------------*/
 /* Data Representation */
 /*---------------------------------------------------------------------------*/
@@ -1448,5 +1447,3 @@ const struct uip_mcast6_driver roll_tm_driver = {
   in,
 };
 /*---------------------------------------------------------------------------*/
-
-#endif /* UIP_CONF_IPV6 */

core/net/ipv6/multicast/smrf.c

@@ -52,7 +52,6 @@
 #define DEBUG DEBUG_NONE
 #include "net/ip/uip-debug.h"
 
-#if UIP_CONF_IPV6
 /*---------------------------------------------------------------------------*/
 /* Macros */
 /*---------------------------------------------------------------------------*/
@@ -207,5 +206,3 @@ const struct uip_mcast6_driver smrf_driver = {
   in,
 };
 /*---------------------------------------------------------------------------*/
-
-#endif /* UIP_CONF_IPV6 */

core/net/ipv6/multicast/uip-mcast6-route.c

@@ -45,7 +45,6 @@
 #include <stdint.h>
 #include <string.h>
 
-#if UIP_CONF_IPV6
 /*---------------------------------------------------------------------------*/
 /* Size of the multicast routing table */
 #ifdef UIP_MCAST6_ROUTE_CONF_ROUTES
@@ -129,5 +128,3 @@ uip_mcast6_route_init()
   list_init(mcast_route_list);
 }
 /*---------------------------------------------------------------------------*/
-
-#endif /* UIP_CONF_IPV6 */

core/net/ipv6/sicslowpan.c

@@ -69,8 +69,6 @@
 #include "net/ipv6/sicslowpan.h"
 #include "net/netstack.h"
 
-#if UIP_CONF_IPV6
-
 #include <stdio.h>
 
 #define DEBUG DEBUG_NONE
@@ -1929,4 +1927,3 @@ const struct network_driver sicslowpan_driver = {
 };
 /*--------------------------------------------------------------------*/
 /** @} */
-#endif /* UIP_CONF_IPV6 */

core/net/ipv6/uip-ds6-route.c

@@ -36,8 +36,6 @@
 #include "lib/memb.h"
 #include "net/nbr-table.h"
 
-#if UIP_CONF_IPV6
-
 #include <string.h>
 
 /* The nbr_routes holds a neighbor table to be able to maintain
@@ -631,5 +629,3 @@ uip_ds6_defrt_periodic(void)
   }
 }
 /*---------------------------------------------------------------------------*/
-
-#endif /* UIP_CONF_IPV6 */

core/net/ipv6/uip-ds6.c

@@ -50,8 +50,6 @@
 #include "net/ipv6/uip-ds6.h"
 #include "net/ip/uip-packetqueue.h"
 
-#if UIP_CONF_IPV6
-
 #define DEBUG DEBUG_NONE
 #include "net/ip/uip-debug.h"
 
@@ -704,6 +702,5 @@ uip_ds6_compute_reachable_time(void)
                 UIP_ND6_MIN_RANDOM_FACTOR(uip_ds6_if.base_reachable_time));
 }
 /*---------------------------------------------------------------------------*/
-#endif /* UIP_CONF_IPV6 */
 
 /** @}*/

core/net/ipv6/uip-icmp6.c

@@ -68,8 +68,6 @@
 #include "rpl/rpl.h"
 #endif /* UIP_CONF_IPV6_RPL */
 
-#if UIP_CONF_IPV6
-
 /** \brief temporary IP address */
 static uip_ipaddr_t tmp_ipaddr;
 
@@ -421,4 +419,3 @@ uip_icmp6_init()
 }
 /*---------------------------------------------------------------------------*/
 /** @} */
-#endif /* UIP_CONF_IPV6 */

core/net/ipv6/uip-nd6.c

@@ -74,7 +74,6 @@
 #include "net/ipv6/uip-ds6.h"
 #include "lib/random.h"
 
-#if UIP_CONF_IPV6
 /*------------------------------------------------------------------*/
 #define DEBUG 0
 #include "net/ip/uip-debug.h"
@@ -1036,4 +1035,3 @@ uip_nd6_init()
 }
 /*---------------------------------------------------------------------------*/
  /** @} */
-#endif /* UIP_CONF_IPV6 */

core/net/ipv6/uip6.c

@@ -80,7 +80,6 @@
 
 #include <string.h>
 
-#if UIP_CONF_IPV6
 /*---------------------------------------------------------------------------*/
 /* For Debug, logging, statistics                                            */
 /*---------------------------------------------------------------------------*/
@@ -2337,4 +2336,3 @@ uip_send(const void *data, int len)
 }
 /*---------------------------------------------------------------------------*/
 /** @} */
-#endif /* UIP_CONF_IPV6 */

core/net/rpl/rpl-dag.c

@@ -59,7 +59,6 @@
 #define DEBUG DEBUG_NONE
 #include "net/ip/uip-debug.h"
 
-#if UIP_CONF_IPV6
 /*---------------------------------------------------------------------------*/
 extern rpl_of_t RPL_OF;
 static rpl_of_t * const objective_functions[] = {&RPL_OF};
@@ -1319,5 +1318,4 @@ rpl_lock_parent(rpl_parent_t *p)
   nbr_table_lock(rpl_parents, p);
 }
 /*---------------------------------------------------------------------------*/
-#endif /* UIP_CONF_IPV6 */
 /** @} */

core/net/rpl/rpl-ext-header.c

@@ -65,7 +65,6 @@
 #define UIP_EXT_HDR_OPT_PADN_BUF  ((struct uip_ext_hdr_opt_padn *)&uip_buf[uip_l2_l3_hdr_len + uip_ext_opt_offset])
 #define UIP_EXT_HDR_OPT_RPL_BUF   ((struct uip_ext_hdr_opt_rpl *)&uip_buf[uip_l2_l3_hdr_len + uip_ext_opt_offset])
 /*---------------------------------------------------------------------------*/
-#if UIP_CONF_IPV6
 int
 rpl_verify_header(int uip_ext_opt_offset)
 {
@@ -378,6 +377,5 @@ rpl_insert_header(void)
   }
 }
 /*---------------------------------------------------------------------------*/
-#endif /* UIP_CONF_IPV6 */
 
 /** @}*/

core/net/rpl/rpl-icmp6.c

@@ -61,7 +61,6 @@
 
 #include "net/ip/uip-debug.h"
 
-#if UIP_CONF_IPV6
 /*---------------------------------------------------------------------------*/
 #define RPL_DIO_GROUNDED                 0x80
 #define RPL_DIO_MOP_SHIFT                3
@@ -958,6 +957,5 @@ rpl_icmp6_register_handlers()
   uip_icmp6_register_input_handler(&dao_ack_handler);
 }
 /*---------------------------------------------------------------------------*/
-#endif /* UIP_CONF_IPV6 */
 
 /** @}*/

core/net/rpl/rpl-timers.c

@@ -47,8 +47,6 @@
 #include "lib/random.h"
 #include "sys/ctimer.h"
 
-#if UIP_CONF_IPV6
-
 #define DEBUG DEBUG_NONE
 #include "net/ip/uip-debug.h"
 
@@ -325,6 +323,5 @@ rpl_cancel_dao(rpl_instance_t *instance)
   ctimer_stop(&instance->dao_lifetime_timer);
 }
 /*---------------------------------------------------------------------------*/
-#endif /* UIP_CONF_IPV6 */
 
 /** @}*/

core/net/rpl/rpl.c

@@ -55,8 +55,6 @@
 #include <limits.h>
 #include <string.h>
 
-#if UIP_CONF_IPV6
-
 #if RPL_CONF_STATS
 rpl_stats_t rpl_stats;
 #endif
@@ -316,6 +314,5 @@ rpl_init(void)
   RPL_OF.reset(NULL);
 }
 /*---------------------------------------------------------------------------*/
-#endif /* UIP_CONF_IPV6 */
 
 /** @}*/