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

Merge pull request #894 from simonduq/ds6-fix

Browse source 
Fix conditional compilation directive in uip-ds6.c
This commit is contained in:
Nicolas Tsiftes 2014-12-03 18:26:51 +01:00
parent ee7c847048 984c8e007b
commit b6b5c6efbb
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/net/ipv6/uip-ds6.c
View file

@ -186,12 +186,12 @@ uip_ds6_periodic(void)
uip_ds6_neighbor_periodic(); uip_ds6_neighbor_periodic();
#if UIP_CONF_ROUTER & UIP_ND6_SEND_RA #if UIP_CONF_ROUTER && UIP_ND6_SEND_RA
/* Periodic RA sending */ /* Periodic RA sending */
if(stimer_expired(&uip_ds6_timer_ra) && (uip_len == 0)) { if(stimer_expired(&uip_ds6_timer_ra) && (uip_len == 0)) {
uip_ds6_send_ra_periodic(); uip_ds6_send_ra_periodic();
} }
#endif /* UIP_CONF_ROUTER & UIP_ND6_SEND_RA */ #endif /* UIP_CONF_ROUTER && UIP_ND6_SEND_RA */
etimer_reset(&uip_ds6_timer_periodic); etimer_reset(&uip_ds6_timer_periodic);
return; return;
} }