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

Merge pull request #1622 from simonduq/pr/disable-dao-ack

Browse source 
Fixing 04-rpl-large-network
This commit is contained in:
Simon Duquennoy 2016-04-25 11:40:25 +02:00
commit c17e2f7010
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/net/rpl/rpl-conf.h
View file

@ -242,7 +242,7 @@
#ifdef RPL_CONF_WITH_DAO_ACK #ifdef RPL_CONF_WITH_DAO_ACK
#define RPL_WITH_DAO_ACK RPL_CONF_WITH_DAO_ACK #define RPL_WITH_DAO_ACK RPL_CONF_WITH_DAO_ACK
#else #else
#define RPL_WITH_DAO_ACK 1 #define RPL_WITH_DAO_ACK 0
#endif /* RPL_CONF_WITH_DAO_ACK */ #endif /* RPL_CONF_WITH_DAO_ACK */
/* /*

2
regression-tests/Makefile.simulation-test
View file

@ -31,7 +31,7 @@ TESTLOGS=$(patsubst %.csc,%.testlog,$(TESTS))
LOGS=$(patsubst %.csc,%.log,$(TESTS)) LOGS=$(patsubst %.csc,%.log,$(TESTS))
FAILLOGS=$(patsubst %.csc,%.*.faillog,$(TESTS)) FAILLOGS=$(patsubst %.csc,%.*.faillog,$(TESTS))
#Set random seeds to create reproduceable results. #Set random seeds to create reproduceable results.
RANDOMSEED=1 5 RANDOMSEED=1
CONTIKI=../.. CONTIKI=../..