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

8
core/net/ipv6/uip6.c
View file

@ -451,7 +451,7 @@ uip_init(void)
}
#endif /* UIP_UDP */
#if UIP_CONF_IPV6_MULTICAST
#if UIP_IPV6_MULTICAST
UIP_MCAST6.init();
#endif
}
@ -1192,7 +1192,7 @@ uip_process(uint8_t flag)
* All multicast engines must hook in here. After this function returns, we
* expect UIP_BUF to be unmodified
*/
#if UIP_CONF_IPV6_MULTICAST
#if UIP_IPV6_MULTICAST
if(uip_is_addr_mcast_routable(&UIP_IP_BUF->destipaddr)) {
if(UIP_MCAST6.in() == UIP_MCAST6_ACCEPT) {
/* Deliver up the stack */
@ -1202,7 +1202,7 @@ uip_process(uint8_t flag)
goto drop;
}
}
#endif /* UIP_CONF_IPV6_MULTICAST */
#endif /* UIP_IPV6_MULTICAST */
/* TBD Some Parameter problem messages */
if(!uip_ds6_is_my_addr(&UIP_IP_BUF->destipaddr) &&
@ -1276,7 +1276,7 @@ uip_process(uint8_t flag)
uip_ext_bitmap = 0;
#endif /* UIP_CONF_ROUTER */
#if UIP_CONF_IPV6_MULTICAST
#if UIP_IPV6_MULTICAST
process:
#endif