From be228837240b27d4e8afd9e8ce17772de4b4f790 Mon Sep 17 00:00:00 2001 From: kkrentz Date: Fri, 24 May 2013 00:31:14 -0700 Subject: [PATCH] framer-802154: Introduced mnemonic variable --- core/net/mac/framer-802154.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/core/net/mac/framer-802154.c b/core/net/mac/framer-802154.c index a83cc13b4..ce49a4dec 100644 --- a/core/net/mac/framer-802154.c +++ b/core/net/mac/framer-802154.c @@ -207,10 +207,11 @@ static int parse(void) { frame802154_t frame; - int len; - len = packetbuf_datalen(); - if(frame802154_parse(packetbuf_dataptr(), len, &frame) && - packetbuf_hdrreduce(len - frame.payload_len)) { + int hdr_len; + + hdr_len = frame802154_parse(packetbuf_dataptr(), packetbuf_datalen(), &frame); + + if(hdr_len && packetbuf_hdrreduce(hdr_len)) { if(frame.fcf.dest_addr_mode) { if(frame.dest_pid != mac_src_pan_id && frame.dest_pid != FRAME802154_BROADCASTPANDID) { @@ -230,9 +231,9 @@ parse(void) PRINTF("15.4-IN: %2X", frame.fcf.frame_type); PRINTADDR(packetbuf_addr(PACKETBUF_ADDR_SENDER)); PRINTADDR(packetbuf_addr(PACKETBUF_ADDR_RECEIVER)); - PRINTF("%u (%u)\n", packetbuf_datalen(), len); - - return len - frame.payload_len; + PRINTF("%d %u (%u)\n", hdr_len, packetbuf_datalen(), packetbuf_totlen()); + + return hdr_len; } return FRAMER_FAILED; }