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

Merge remote-tracking branch 'sf/master' into rpl-patch

Browse source 
Conflicts:
	core/net/tcpip.c
This commit is contained in:
Nicolas Tsiftes 2011-12-08 15:26:11 +01:00
commit d0ebeb409e
117 changed files with 8260 additions and 6932 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/net/tcpip.c
View file

@ -630,8 +630,8 @@ tcpip_ipv6_output(void)
memcpy(uip_packetqueue_buf(&nbr->packethandle), UIP_IP_BUF, uip_len);
uip_packetqueue_set_buflen(&nbr->packethandle, uip_len);
}
uip_len = 0;
#endif /*UIP_CONF_IPV6_QUEUE_PKT*/
uip_len = 0;
return;
}
/* Send in parallel if we are running NUD (nbc state is either STALE,