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

Restore packetbuf before mac callback (earlier commit was accidental reverted)

Browse source
This commit is contained in:
Niclas Finne 2011-11-15 16:59:12 +01:00
parent c273969400
commit 63e40d195e
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/net/mac/contikimac.c
View file

@ -817,11 +817,12 @@ qsend_list(mac_callback_t sent, void *ptr, struct rdc_buf_list *buf_list)
struct rdc_buf_list *next; struct rdc_buf_list *next;
int ret; int ret;
if(curr == NULL) { if(curr == NULL) {
mac_call_sent_callback(sent, ptr, MAC_TX_ERR, 1);
return; return;
} }
/* Do not send during reception of a burst */ /* Do not send during reception of a burst */
if(we_are_receiving_burst) { if(we_are_receiving_burst) {
/* Prepare the packetbuf for callback */
queuebuf_to_packetbuf(curr->buf);
/* Return COLLISION so the MAC may try again later */ /* Return COLLISION so the MAC may try again later */
mac_call_sent_callback(sent, ptr, MAC_TX_COLLISION, 1); mac_call_sent_callback(sent, ptr, MAC_TX_COLLISION, 1);
return; return;