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

Merge branch 'osd' into ico

Browse source 
Conflicts resolved:
	core/net/mac/contikimac/contikimac.c
This commit is contained in:
Ralf Schlatterbeck 2016-06-30 09:28:54 +02:00
commit 7d63a0f487
1020 changed files with 70078 additions and 10930 deletions
Download patch file Download diff file Expand all files Collapse all files

3
core/net/mac/rdc.h
View file

@ -43,6 +43,7 @@
#include "contiki-conf.h"
#include "net/mac/mac.h"
#include "net/llsec/llsec802154.h"
#ifdef RDC_CONF_WITH_DUPLICATE_DETECTION
#define RDC_WITH_DUPLICATE_DETECTION RDC_CONF_WITH_DUPLICATE_DETECTION
@ -51,7 +52,7 @@
frame because it has seen its sequence number already. Replay
protection should be implemented at the LLSEC layer where the
authenticity of frames is verified. */
#define RDC_WITH_DUPLICATE_DETECTION !LLSEC802154_CONF_SECURITY_LEVEL
#define RDC_WITH_DUPLICATE_DETECTION !LLSEC802154_ENABLED
#endif /* RDC_CONF_WITH_DUPLICATE_DETECTION */
/* List of packets to be sent by RDC layer */