Merge remote-tracking branch 'contiki-os/master'

This commit is contained in:
xukai 2016-06-10 12:54:59 +08:00
commit bd0716b044
53 changed files with 14062 additions and 318 deletions

View file

@ -136,6 +136,9 @@
#ifndef UIP_CONF_MAX_ROUTES
#define UIP_CONF_MAX_ROUTES 300
#endif /* UIP_CONF_MAX_ROUTES */
#ifndef RPL_NS_CONF_LINK_NUM
#define RPL_NS_CONF_LINK_NUM 300
#endif /* RPL_NS_CONF_LINK_NUM */
#define TCPIP_CONF_ANNOTATE_TRANSMISSIONS 1