Merge pull request #894 from simonduq/ds6-fix
Fix conditional compilation directive in uip-ds6.c
This commit is contained in:
commit
b6b5c6efbb
@ -186,12 +186,12 @@ uip_ds6_periodic(void)
|
||||
|
||||
uip_ds6_neighbor_periodic();
|
||||
|
||||
#if UIP_CONF_ROUTER & UIP_ND6_SEND_RA
|
||||
#if UIP_CONF_ROUTER && UIP_ND6_SEND_RA
|
||||
/* Periodic RA sending */
|
||||
if(stimer_expired(&uip_ds6_timer_ra) && (uip_len == 0)) {
|
||||
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);
|
||||
return;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user