deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
osd-contiki/core/net
History
Ralf Schlatterbeck 7d63a0f487 Merge branch 'osd' into ico 
Conflicts resolved:
	core/net/mac/contikimac/contikimac.c
2016-06-30 09:28:54 +02:00
..
http-socket Merge pull request #1696 from momote-io/fixes 2016-06-05 12:46:59 +02:00
ip Rename two macros related to multicast, which are not user configuration 2016-06-20 16:35:09 +02:00
ip64 Fix ip64 warnings 2016-02-04 00:26:54 +01:00
ipv4 Merge pull request #1303 from oliverschmidt/master 2015-10-10 19:55:28 +02:00
ipv6 Merge pull request #1689 from kqorany/kqorany-esmrf 2016-06-28 23:23:30 +01:00
llsec noncoresec: Fix build errors with DEBUG set to 1 2016-06-23 22:10:43 +02:00
mac Merge branch 'osd' into ico 2016-06-30 09:28:54 +02:00
rime fix the bug about chalemeon raw hdrsize 2016-05-25 10:28:47 +08:00
rpl bugfix merge 2016-06-29 07:50:41 +02:00
link-stats.c link_stats_input_callback: do not use EWMA when initializing RSSI 2016-06-03 18:43:35 +02:00
link-stats.h Added link-stats module to keep strack of link statistics and their freshness 2016-06-03 15:46:04 +02:00
linkaddr.c [doc] Give files a common structure by placing license first (partial) 2014-11-10 23:54:49 +01:00
linkaddr.h [doc] Give files a common structure by placing license first (partial) 2014-11-10 23:54:49 +01:00
nbr-table.c added error check for extraction of aligned llao 2016-04-22 15:03:03 +02:00
nbr-table.h Link-stats: use new nbr table API 2016-06-03 16:44:12 +02:00
net-debug.c Added net-debug.[ch] to provide debug functions even in the non-IP case 2016-04-26 16:08:10 +02:00
net-debug.h Added net-debug.[ch] to provide debug functions even in the non-IP case 2016-04-26 16:08:10 +02:00
netstack.c netstack: Fix missing llsec init 2016-01-04 00:28:26 +01:00
netstack.h llsec: Added a layer in between NETSTACK_MAC and NETSTACK_NETWORK for implementing link layer security 2014-08-04 01:09:57 -07:00
packetbuf.c packetbuf: No more splitting of header and data 2016-04-15 03:12:40 -07:00
packetbuf.h Merge pull request #1425 from kkrentz/llsec-fixes 2016-04-19 17:29:00 +02:00
queuebuf.c Remove the unused reference queuebufs, as they only make the code more complex than it needs to be 2015-04-01 10:01:57 +02:00
queuebuf.h [doc] Give files a common structure by placing license first (partial) 2014-11-10 23:54:49 +01:00