osd-contiki/core/net/mac
Ralf Schlatterbeck 7d63a0f487 Merge branch 'osd' into ico
Conflicts resolved:
	core/net/mac/contikimac/contikimac.c
2016-06-30 09:28:54 +02:00
..
contikimac Merge branch 'osd' into ico 2016-06-30 09:28:54 +02:00
cxmac Channel check interval is clock_time_t 2016-05-07 11:46:27 +02:00
sicslowmac Channel check interval is clock_time_t 2016-05-07 11:46:27 +02:00
tsch Update the list of supported platforms in TSCH README file 2016-06-14 19:47:59 +03:00
csma.c Csma: comply with IEEE 802.15.4 2016-04-25 08:52:48 -06:00
csma.h A massive all-tree automated update of all double inclusion guard #defines that changes from using two underscores as a prefix, which are reserved, to not using two underscores as a prefix 2013-11-24 20:20:11 +01:00
frame802154.c llsec: Permit dynamic security levels 2016-04-13 07:54:46 -07:00
frame802154.h Added support for IEEE 802.15.4 frame version 2 2015-12-04 15:21:50 +01:00
frame802154e-ie.c Added net-debug.[ch] to provide debug functions even in the non-IP case 2016-04-26 16:08:10 +02:00
frame802154e-ie.h Add support for IEEE 802.15.4e Information Elements (IEs). All IEs used by TSCH are currently included. 2015-12-04 15:21:50 +01:00
framer-802154.c llsec: Permit dynamic security levels 2016-04-13 07:54:46 -07:00
framer-802154.h A massive all-tree automated update of all double inclusion guard #defines that changes from using two underscores as a prefix, which are reserved, to not using two underscores as a prefix 2013-11-24 20:20:11 +01:00
framer-nullmac.c llsec: Let llsec_drivers define their own framer 2015-10-14 08:21:40 -07:00
framer-nullmac.h A massive all-tree automated update of all double inclusion guard #defines that changes from using two underscores as a prefix, which are reserved, to not using two underscores as a prefix 2013-11-24 20:20:11 +01:00
framer.h llsec: Let llsec_drivers define their own framer 2015-10-14 08:21:40 -07:00
mac-sequence.c Consistently use PACKETBUF_ATTR_MAC_SEQNO for MAC sequence number, both input and output. Disable PACKETBUF_ATTR_PACKET_ID in the non-Rime case. 2015-05-06 16:34:44 +02:00
mac-sequence.h rdc: duplicate packets: Factor out detection code 2013-11-25 13:01:11 +01:00
mac.c Minor bugfix: explicitly cast pointer argument in debug printf 2013-03-18 11:22:05 +01:00
mac.h A massive all-tree automated update of all double inclusion guard #defines that changes from using two underscores as a prefix, which are reserved, to not using two underscores as a prefix 2013-11-24 20:20:11 +01:00
nordc.c Channel check interval is clock_time_t 2016-05-07 11:46:27 +02:00
nullmac.c llsec: Added a layer in between NETSTACK_MAC and NETSTACK_NETWORK for implementing link layer security 2014-08-04 01:09:57 -07:00
nullmac.h A massive all-tree automated update of all double inclusion guard #defines that changes from using two underscores as a prefix, which are reserved, to not using two underscores as a prefix 2013-11-24 20:20:11 +01:00
nullrdc-noframer.c Channel check interval is clock_time_t 2016-05-07 11:46:27 +02:00
nullrdc-noframer.h A massive all-tree automated update of all double inclusion guard #defines that changes from using two underscores as a prefix, which are reserved, to not using two underscores as a prefix 2013-11-24 20:20:11 +01:00
nullrdc.c Channel check interval is clock_time_t 2016-05-07 11:46:27 +02:00
nullrdc.h A massive all-tree automated update of all double inclusion guard #defines that changes from using two underscores as a prefix, which are reserved, to not using two underscores as a prefix 2013-11-24 20:20:11 +01:00
phase.c refactored the rpl-nbr-policy to be called from nbr-table module 2016-03-26 09:45:37 +01:00
phase.h Changed the name of the rimeaddr module to linkaddr 2014-01-29 20:12:24 +01:00
rdc.h Merge branch 'osd' into ico 2016-06-30 09:28:54 +02:00