From 48997bb3ad666c992454462f98599a2837ce1114 Mon Sep 17 00:00:00 2001 From: Simon Duquennoy Date: Wed, 11 Oct 2017 17:26:08 +0200 Subject: [PATCH] Use 802.15.4 frames v2 by default only for TSCH, else fall back to v1 --- os/net/mac/framer/frame802154.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/os/net/mac/framer/frame802154.h b/os/net/mac/framer/frame802154.h index 24a8c632c..c7cd23b2a 100644 --- a/os/net/mac/framer/frame802154.h +++ b/os/net/mac/framer/frame802154.h @@ -77,7 +77,13 @@ #ifdef FRAME802154_CONF_VERSION #define FRAME802154_VERSION FRAME802154_CONF_VERSION #else /* FRAME802154_CONF_VERSION */ +/* Use frame v2 if TSCH is used, otherwise stick to v1 (more +frame-fileting-friendly on some platforms) */ +#if MAC_CONF_WITH_TSCH #define FRAME802154_VERSION FRAME802154_IEEE802154_2015 +#else /* MAC_CONF_WITH_TSCH */ +#define FRAME802154_VERSION FRAME802154_IEEE802154_2006 +#endif /* MAC_CONF_WITH_TSCH */ #endif /* FRAME802154_CONF_VERSION */ #ifdef FRAME802154_CONF_SUPPR_SEQNO