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

Merge pull request #541 from drakkar-lig/degug-compile-error

Browse source 
Fix compilation error when DEBUG enabled in core/net/mac/framer-nullmac....
This commit is contained in:
Nicolas Tsiftes 2014-01-25 07:09:25 -08:00
parent 0258c413cc 662eb4db14
commit 2e27bdda79
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/net/mac/framer-nullmac.c
View file

@ -67,7 +67,7 @@ create(void)
rimeaddr_copy(&(hdr->receiver), packetbuf_addr(PACKETBUF_ADDR_RECEIVER)); rimeaddr_copy(&(hdr->receiver), packetbuf_addr(PACKETBUF_ADDR_RECEIVER));
return sizeof(struct nullmac_hdr); return sizeof(struct nullmac_hdr);
} }
PRINTF("PNULLMAC-UT: too large header: %u\n", len); PRINTF("PNULLMAC-UT: too large header: %u\n", sizeof(struct nullmac_hdr));
return FRAMER_FAILED; return FRAMER_FAILED;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
@ -83,7 +83,7 @@ parse(void)
PRINTF("PNULLMAC-IN: "); PRINTF("PNULLMAC-IN: ");
PRINTADDR(packetbuf_addr(PACKETBUF_ADDR_SENDER)); PRINTADDR(packetbuf_addr(PACKETBUF_ADDR_SENDER));
PRINTADDR(packetbuf_addr(PACKETBUF_ADDR_RECEIVER)); PRINTADDR(packetbuf_addr(PACKETBUF_ADDR_RECEIVER));
PRINTF("%u (%u)\n", packetbuf_datalen(), len); PRINTF("%u (%u)\n", packetbuf_datalen(), sizeof(struct nullmac_hdr));
return sizeof(struct nullmac_hdr); return sizeof(struct nullmac_hdr);
} }