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

Merge pull request #657 from atiselsts/networking_patches

Browse source 
Phase RDC memory allocation bugfix
This commit is contained in:
Nicolas Tsiftes 2015-09-24 16:50:00 +02:00
parent 3fcff231ec b75f673801
commit a536801e24
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/net/mac/phase.c
View file

@ -219,6 +219,11 @@ phase_wait(const linkaddr_t *neighbor, rtimer_clock_t cycle_time,
if(buf_list == NULL) { if(buf_list == NULL) {
packetbuf_set_attr(PACKETBUF_ATTR_IS_CREATED_AND_SECURED, 1); packetbuf_set_attr(PACKETBUF_ATTR_IS_CREATED_AND_SECURED, 1);
p->q = queuebuf_new_from_packetbuf(); p->q = queuebuf_new_from_packetbuf();
if(p->q == NULL) {
/* memory allocation failed */
memb_free(&queued_packets_memb, p);
return PHASE_UNKNOWN;
}
} }
p->mac_callback = mac_callback; p->mac_callback = mac_callback;
p->mac_callback_ptr = mac_callback_ptr; p->mac_callback_ptr = mac_callback_ptr;