deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Rename two macros related to multicast, which are not user configuration

Browse source 
- UIP_CONF_IPV6_MULTICAST -> UIP_IPV6_MULTICAST
- RPL_CONF_MULTICAST      -> RPL_WITH_MULTICAST
This commit is contained in:
Yasuyuki Tanaka 2016-06-20 16:35:09 +02:00
parent 704847db04
commit ca3a4726d1
12 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/net/rpl/rpl-icmp6.c
View file

@ -92,7 +92,7 @@ void RPL_DEBUG_DAO_OUTPUT(rpl_parent_t *);
static uint8_t dao_sequence = RPL_LOLLIPOP_INIT;
#if RPL_CONF_MULTICAST
#if RPL_WITH_MULTICAST
static uip_mcast6_route_t *mcast_group;
#endif
/*---------------------------------------------------------------------------*/
@ -755,7 +755,7 @@ dao_input_storing(void)
PRINT6ADDR(&prefix);
PRINTF("\n");
#if RPL_CONF_MULTICAST
#if RPL_WITH_MULTICAST
if(uip_is_addr_mcast_global(&prefix)) {
mcast_group = uip_mcast6_route_add(&prefix);
if(mcast_group) {
@ -845,7 +845,7 @@ dao_input_storing(void)
rep->state.lifetime = RPL_LIFETIME(instance, lifetime);
RPL_ROUTE_CLEAR_NOPATH_RECEIVED(rep);
#if RPL_CONF_MULTICAST
#if RPL_WITH_MULTICAST
fwd_dao:
#endif