Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2024-12-22 10:30:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #987 from ioannisg/send-ns-in-tcpip_ipv6_output

Browse Source 
Send the first NS attempt inside tcpip_ipv6_output()
This commit is contained in:
Simon Duquennoy 2015-09-28 13:29:04 +02:00
commit 1a6681a09d
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/net/ip/tcpip.c
View File

@ -660,7 +660,11 @@ tcpip_ipv6_output(void)
stimer_set(&nbr->sendns, uip_ds6_if.retrans_timer / 1000); stimer_set(&nbr->sendns, uip_ds6_if.retrans_timer / 1000);
nbr->nscount = 1; nbr->nscount = 1;
/* Send the first NS try from here (multicast destination IP address). */
} }
#else /* UIP_ND6_SEND_NA */
uip_len = 0;
return;
#endif /* UIP_ND6_SEND_NA */ #endif /* UIP_ND6_SEND_NA */
} else { } else {
#if UIP_ND6_SEND_NA #if UIP_ND6_SEND_NA
@ -707,7 +711,6 @@ tcpip_ipv6_output(void)
uip_clear_buf(); uip_clear_buf();
return; return;
} }
return;
} }
/* Multicast IP destination address. */ /* Multicast IP destination address. */
tcpip_output(NULL); tcpip_output(NULL);