diff --git a/core/net/mac/framer/frame802154.h b/core/net/mac/framer/frame802154.h index 64289522e..50deca0ae 100644 --- a/core/net/mac/framer/frame802154.h +++ b/core/net/mac/framer/frame802154.h @@ -77,7 +77,7 @@ #ifdef FRAME802154_CONF_VERSION #define FRAME802154_VERSION FRAME802154_CONF_VERSION #else /* FRAME802154_CONF_VERSION */ -#define FRAME802154_VERSION FRAME802154_IEEE802154_2006 +#define FRAME802154_VERSION FRAME802154_IEEE802154_2015 #endif /* FRAME802154_CONF_VERSION */ #ifdef FRAME802154_CONF_SUPPR_SEQNO diff --git a/examples/ipv6/rpl-simple/project-conf.h b/examples/ipv6/rpl-simple/project-conf.h index e5a716528..539172451 100644 --- a/examples/ipv6/rpl-simple/project-conf.h +++ b/examples/ipv6/rpl-simple/project-conf.h @@ -67,10 +67,6 @@ #undef NETSTACK_CONF_MAC #define NETSTACK_CONF_MAC tschmac_driver -/* IEEE802.15.4 frame version */ -#undef FRAME802154_CONF_VERSION -#define FRAME802154_CONF_VERSION FRAME802154_IEEE802154_2015 - /* TSCH and RPL callbacks */ #define RPL_CALLBACK_PARENT_SWITCH tsch_rpl_callback_parent_switch #define RPL_CALLBACK_NEW_DIO_INTERVAL tsch_rpl_callback_new_dio_interval diff --git a/examples/ipv6/rpl-tsch/project-conf.h b/examples/ipv6/rpl-tsch/project-conf.h index 67e8bbf46..16b05fffa 100644 --- a/examples/ipv6/rpl-tsch/project-conf.h +++ b/examples/ipv6/rpl-tsch/project-conf.h @@ -62,10 +62,6 @@ #undef NETSTACK_CONF_MAC #define NETSTACK_CONF_MAC tschmac_driver -/* IEEE802.15.4 frame version */ -#undef FRAME802154_CONF_VERSION -#define FRAME802154_CONF_VERSION FRAME802154_IEEE802154_2015 - /* TSCH and RPL callbacks */ #define RPL_CALLBACK_PARENT_SWITCH tsch_rpl_callback_parent_switch #define RPL_CALLBACK_NEW_DIO_INTERVAL tsch_rpl_callback_new_dio_interval diff --git a/examples/platform-specific/jn516x/rpl/common-conf.h b/examples/platform-specific/jn516x/rpl/common-conf.h index 010dcd7ab..a759dcab0 100644 --- a/examples/platform-specific/jn516x/rpl/common-conf.h +++ b/examples/platform-specific/jn516x/rpl/common-conf.h @@ -58,10 +58,6 @@ #define NETSTACK_CONF_MAC tschmac_driver -/* IEEE802.15.4 frame version */ -#undef FRAME802154_CONF_VERSION -#define FRAME802154_CONF_VERSION FRAME802154_IEEE802154_2015 - /* TSCH and RPL callbacks */ #define RPL_CALLBACK_PARENT_SWITCH tsch_rpl_callback_parent_switch #define RPL_CALLBACK_NEW_DIO_INTERVAL tsch_rpl_callback_new_dio_interval diff --git a/examples/platform-specific/jn516x/tsch/common-conf.h b/examples/platform-specific/jn516x/tsch/common-conf.h index f67023e65..bc248a0cd 100644 --- a/examples/platform-specific/jn516x/tsch/common-conf.h +++ b/examples/platform-specific/jn516x/tsch/common-conf.h @@ -139,9 +139,6 @@ #if WITH_TSCH -#undef FRAME802154_CONF_VERSION -#define FRAME802154_CONF_VERSION FRAME802154_IEEE802154_2015 - /* Contiki netstack: MAC */ #undef NETSTACK_CONF_MAC #define NETSTACK_CONF_MAC tschmac_driver diff --git a/regression-tests/13-ieee802154/code-flush-nbr-queue/project-conf.h b/regression-tests/13-ieee802154/code-flush-nbr-queue/project-conf.h index 12cbc174d..2b720ae70 100644 --- a/regression-tests/13-ieee802154/code-flush-nbr-queue/project-conf.h +++ b/regression-tests/13-ieee802154/code-flush-nbr-queue/project-conf.h @@ -48,9 +48,6 @@ #undef NETSTACK_CONF_MAC #define NETSTACK_CONF_MAC tschmac_driver -#undef FRAME802154_CONF_VERSION -#define FRAME802154_CONF_VERSION FRAME802154_IEEE802154_2015 - #if CONTIKI_TARGET_COOJA #define COOJA_CONF_SIMULATE_TURNAROUND 0 #endif /* CONTIKI_TARGET_COOJA */ diff --git a/regression-tests/13-ieee802154/code/project-tsch-conf.h b/regression-tests/13-ieee802154/code/project-tsch-conf.h index fb49d006b..d76d1c548 100644 --- a/regression-tests/13-ieee802154/code/project-tsch-conf.h +++ b/regression-tests/13-ieee802154/code/project-tsch-conf.h @@ -32,9 +32,6 @@ #ifndef _PROJECT_TSCH_CONF_H #define _PROJECT_TSCH_CONF_H -#undef FRAME802154_CONF_VERSION -#define FRAME802154_CONF_VERSION FRAME802154_IEEE802154_2015 - #undef NETSTACK_CONF_MAC #define NETSTACK_CONF_MAC tschmac_driver